зеркало из https://github.com/microsoft/git.git
sha1_file: rename hash_sha1_file_literally
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:
Родитель
3fc7281ffa
Коммит
1752cbbc44
|
@ -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
4
cache.h
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче