diff --git a/builtin-merge.c b/builtin-merge.c
index f7db14846ecbca6b0f928237951d9505b68e5d6a..f4de73fa9d8d4ca4d311cb86d6901346ceb0d19f 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
sha1_to_hex(branch_head), remote);
goto cleanup;
}
+ if (!prefixcmp(found_ref, "refs/remotes/")) {
+ strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n",
+ sha1_to_hex(branch_head), remote);
+ goto cleanup;
+ }
}
/* See if remote matches <name>^^^.. or <name>~<number> */