Fix merge name generation in "merge in C"

When merging an early part of a branch, e.g. "git merge xyzzy~20", we were supposed to say "branch 'xyzzy' (early part)", but it incorrectly said "branch 'refs/heads/xy' (early part)" instead. The logic was supposed to first strip away "~20" part to make sure that what follows "~" is a non-zero posint, prefix it with "refs/heads/" and ask resolve_ref() if it is a ref. If it is, then we know xyzzy was a branch, and we can give the correct message. However, there were a few bugs. First of all, the logic to build this "true branch refname" did not count the characters correctly. At this point of the code, "len" is the number of trailing, non-name part of the given extended SHA-1 expression given by the user, i.e. number of bytes in "~20" in the above example. In addition, the message forgot to skip "refs/heads/" it prefixed from the output. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 30, 2008 at 01:12 UTC 9b6bf4d575e216db9240907940e9f6c619877735

1 file changed +2 -2

builtin-merge.c

+2 -2

@@ -396,12 +396,12 @@ static void merge_name(const char *remote, struct strbuf *msg)

396 struct strbuf truname = STRBUF_INIT;

397 strbuf_addstr(&truname, "refs/heads/");

398 strbuf_addstr(&truname, remote);

399 - strbuf_setlen(&truname, len+11);

399 + strbuf_setlen(&truname, truname.len - len);

400 if (resolve_ref(truname.buf, buf_sha, 0, 0)) {

401 strbuf_addf(msg,

402 "%s\t\tbranch '%s'%s of .\n",

403 sha1_to_hex(remote_head->sha1),

404 - truname.buf,

404 + truname.buf + 11,

405 (early ? " (early part)" : ""));

406 return;

407 }