mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1-file.c: remove the_repo from read_object_with_reference()

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-06-27 16:28:47 +07:00
committed by Junio C Hamano
parent 8dca754b1e
commit d3b4705ab8
7 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fast-import.c
View File

@ -2410,7 +2410,8 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
oidcpy(&commit_oid, &commit_oe->idx.oid);
} else if (!get_oid(p, &commit_oid)) {
unsigned long size;
char *buf = read_object_with_reference(&commit_oid,
char *buf = read_object_with_reference(the_repository,
&commit_oid,
commit_type, &size,
&commit_oid);
if (!buf || size < the_hash_algo->hexsz + 6)
@ -2482,7 +2483,8 @@ static void parse_from_existing(struct branch *b)
unsigned long size;
char *buf;
buf = read_object_with_reference(&b->oid, commit_type, &size,
buf = read_object_with_reference(the_repository,
&b->oid, commit_type, &size,
&b->oid);
parse_from_commit(b, buf, size);
free(buf);
@ -2560,7 +2562,8 @@ static struct hash_list *parse_merge(unsigned int *count)
oidcpy(&n->oid, &oe->idx.oid);
} else if (!get_oid(from, &n->oid)) {
unsigned long size;
char *buf = read_object_with_reference(&n->oid,
char *buf = read_object_with_reference(the_repository,
&n->oid,
commit_type,
&size, &n->oid);
if (!buf || size < the_hash_algo->hexsz + 6)