зеркало из https://github.com/microsoft/git.git
sha1_file: convert hash_sha1_file_literally to struct object_id
Convert all remaining callers as well. Signed-off-by: Patryk Obara <patryk.obara@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e3506559d4
Коммит
da77611d73
|
@ -24,7 +24,7 @@ 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->hash, flags);
|
||||
ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
|
||||
strbuf_release(&buf);
|
||||
return ret;
|
||||
}
|
||||
|
|
2
cache.h
2
cache.h
|
@ -1199,7 +1199,7 @@ static inline const unsigned char *lookup_replace_object(const unsigned char *sh
|
|||
extern int sha1_object_info(const unsigned char *, unsigned long *);
|
||||
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
|
||||
extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
|
||||
extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags);
|
||||
extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
|
||||
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
|
||||
extern int force_object_loose(const unsigned char *sha1, time_t mtime);
|
||||
extern int git_open_cloexec(const char *name, int flags);
|
||||
|
|
|
@ -3437,7 +3437,7 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign
|
|||
}
|
||||
|
||||
int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
|
||||
unsigned char *sha1, unsigned flags)
|
||||
struct object_id *oid, unsigned flags)
|
||||
{
|
||||
char *header;
|
||||
int hdrlen, status = 0;
|
||||
|
@ -3445,13 +3445,13 @@ int hash_sha1_file_literally(const void *buf, unsigned long len, const char *typ
|
|||
/* type string, SP, %lu of the length plus NUL must fit this */
|
||||
hdrlen = strlen(type) + 32;
|
||||
header = xmalloc(hdrlen);
|
||||
write_sha1_file_prepare(buf, len, type, sha1, header, &hdrlen);
|
||||
write_sha1_file_prepare(buf, len, type, oid->hash, header, &hdrlen);
|
||||
|
||||
if (!(flags & HASH_WRITE_OBJECT))
|
||||
goto cleanup;
|
||||
if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
|
||||
if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
|
||||
goto cleanup;
|
||||
status = write_loose_object(sha1, header, hdrlen, buf, len, 0);
|
||||
status = write_loose_object(oid->hash, header, hdrlen, buf, len, 0);
|
||||
|
||||
cleanup:
|
||||
free(header);
|
||||
|
|
Загрузка…
Ссылка в новой задаче