Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t4201: make use of abbreviation in the test more robust
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index a96d4fb501bf1441b52a313313b8c04f3187e4d9..848a29855611d22bf19f3740a577a2b312294257 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-438,7
+438,7
@@
static void merge_name(const char *remote, struct strbuf *msg)
char *found_ref;
int len, early;
- strbuf_branchname(&bname, remote);
+ strbuf_branchname(&bname, remote
, 0
);
remote = bname.buf;
memset(branch_head, 0, sizeof(branch_head));