X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=2207f79969975225077ff16c7c368c4652548862;hb=b81f925f709a10b37fb4fcd03629b55bc890a478;hp=37ce4f589f6582abf0d1ef5bd263f590a16853d5;hpb=2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589..2207f7996 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -437,7 +437,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 		strbuf_addstr(&truname, "refs/heads/");
 		strbuf_addstr(&truname, remote);
 		strbuf_setlen(&truname, truname.len - len);
-		if (resolve_ref(truname.buf, buf_sha, 0, NULL)) {
+		if (resolve_ref(truname.buf, buf_sha, 1, NULL)) {
 			strbuf_addf(msg,
 				    "%s\t\tbranch '%s'%s of .\n",
 				    sha1_to_hex(remote_head->sha1),