files-backend: add and use files_reflog_path()

diff --git a/builtin/merge.c b/builtin/merge.c
index 099cfab447672612892f3c2297d2667f6f79b7b1..7554b8d4127ada8261d1f913c6215e93ca42ef7d 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;
 
        oidclr(&branch_head);