development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-04 16:48:40 +00:00
Code Issues Projects Releases Wiki Activity

sha1_file: rename hash_sha1_file_literally

Browse Source 
This function was already converted to use struct object_id earlier.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patryk Obara 2018-01-28 01:13:22 +01:00 committed by Junio C Hamano
parent 3fc7281ffa
commit 1752cbbc44
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/hash-object.c
View File

@ -24,7 +24,8 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig
if (strbuf_read(&buf, fd, 4096) < 0)
ret = -1;
else
ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
ret = hash_object_file_literally(buf.buf, buf.len, type, oid,
flags);
strbuf_release(&buf);
return ret;
}

4
cache.h
View File

@ -1243,7 +1243,9 @@ extern int hash_object_file(const void *buf, unsigned long len,
extern int write_object_file(const void *buf, unsigned long len,
const char *type, struct object_id *oid);
extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
extern int hash_object_file_literally(const void *buf, unsigned long len,
const char *type, struct object_id *oid,
unsigned flags);
extern int pretend_object_file(void *, unsigned long, enum object_type,
struct object_id *oid);

5
sha1_file.c
View File

@ -1652,8 +1652,9 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
}
int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
struct object_id *oid, unsigned flags)
int hash_object_file_literally(const void *buf, unsigned long len,
const char *type, struct object_id *oid,
unsigned flags)
{
char *header;
int hdrlen, status = 0;