summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-04-06 11:34:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-08 08:26:32 (GMT)
commit8f56e9d4baa836a4a3cd56767457d6122de7ce1d (patch)
tree03f7be684fc4529397db0e28e429255f6e1cc251 /refs.c
parent546edf37ae427cf5fdb8c00d1820df73cd16eed6 (diff)
downloadgit-8f56e9d4baa836a4a3cd56767457d6122de7ce1d.zip
git-8f56e9d4baa836a4a3cd56767457d6122de7ce1d.tar.gz
git-8f56e9d4baa836a4a3cd56767457d6122de7ce1d.tar.bz2
refs.c: remove the_repo from substitute_branch_name()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/refs.c b/refs.c
index 3dde824..44df049 100644
--- a/refs.c
+++ b/refs.c
@@ -539,10 +539,11 @@ void expand_ref_prefix(struct argv_array *prefixes, const char *prefix)
* later free()ing) if the string passed in is a magic short-hand form
* to name a branch.
*/
-static char *substitute_branch_name(const char **string, int *len)
+static char *substitute_branch_name(struct repository *r,
+ const char **string, int *len)
{
struct strbuf buf = STRBUF_INIT;
- int ret = interpret_branch_name(*string, *len, &buf, 0);
+ int ret = repo_interpret_branch_name(r, *string, *len, &buf, 0);
if (ret == *len) {
size_t size;
@@ -556,7 +557,7 @@ static char *substitute_branch_name(const char **string, int *len)
int dwim_ref(const char *str, int len, struct object_id *oid, char **ref)
{
- char *last_branch = substitute_branch_name(&str, &len);
+ char *last_branch = substitute_branch_name(the_repository, &str, &len);
int refs_found = expand_ref(str, len, oid, ref);
free(last_branch);
return refs_found;
@@ -596,7 +597,7 @@ int expand_ref(const char *str, int len, struct object_id *oid, char **ref)
int dwim_log(const char *str, int len, struct object_id *oid, char **log)
{
- char *last_branch = substitute_branch_name(&str, &len);
+ char *last_branch = substitute_branch_name(the_repository, &str, &len);
const char **p;
int logs_found = 0;
struct strbuf path = STRBUF_INIT;