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

sha1-name.c: remove the_repo from get_describe_name()

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-04-16 16:33:30 +07:00
committed by Junio C Hamano
parent 0bb41a1985
commit 0c6b5ba1bb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sha1-name.c
View File

@ -1097,7 +1097,9 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
return 0;
}
static int get_describe_name(const char *name, int len, struct object_id *oid)
static int get_describe_name(struct repository *r,
const char *name, int len,
struct object_id *oid)
{
const char *cp;
unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
@ -1111,7 +1113,7 @@ static int get_describe_name(const char *name, int len, struct object_id *oid)
if (ch == 'g' && cp[-1] == '-') {
cp++;
len -= cp - name;
return get_short_oid(the_repository,
return get_short_oid(r,
cp, len, oid, flags);
}
}
@ -1162,7 +1164,7 @@ static enum get_oid_result get_oid_1(const char *name, int len,
return FOUND;
/* It could be describe output that is "SOMETHING-gXXXX" */
ret = get_describe_name(name, len, oid);
ret = get_describe_name(the_repository, name, len, oid);
if (!ret)
return FOUND;