mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 03:06:10 +02:00
Code

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

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:27 +07:00 committed by Junio C Hamano
parent 23a5712938
commit ea1c873c7d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sha1-name.c
View File

@ -1412,9 +1412,9 @@ static int reinterpret(const char *name, int namelen, int len,
return ret - used + len;
}
static void set_shortened_ref(struct strbuf *buf, const char *ref)
static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
{
char *s = shorten_unambiguous_ref(ref, 0);
char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
strbuf_reset(buf);
strbuf_addstr(buf, s);
free(s);
@ -1435,7 +1435,8 @@ static int branch_interpret_allowed(const char *refname, unsigned allowed)
return 0;
}
static int interpret_branch_mark(const char *name, int namelen,
static int interpret_branch_mark(struct repository *r,
const char *name, int namelen,
int at, struct strbuf *buf,
int (*get_mark)(const char *, int),
const char *(*get_data)(struct branch *,
@ -1468,7 +1469,7 @@ static int interpret_branch_mark(const char *name, int namelen,
if (!branch_interpret_allowed(value, allowed))
return -1;
set_shortened_ref(buf, value);
set_shortened_ref(r, buf, value);
return len + at;
}
@ -1509,13 +1510,13 @@ int repo_interpret_branch_name(struct repository *r,
allowed);
}
len = interpret_branch_mark(name, namelen, at - name, buf,
len = interpret_branch_mark(the_repository, name, namelen, at - name, buf,
upstream_mark, branch_get_upstream,
allowed);
if (len > 0)
return len;
len = interpret_branch_mark(name, namelen, at - name, buf,
len = interpret_branch_mark(the_repository, name, namelen, at - name, buf,
push_mark, branch_get_push,
allowed);
if (len > 0)