diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-01-03 21:03:10 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 07:44:07 -0800 |
| commit | 20b630aae924e35c24ee3d082362c36bee1c97b3 (patch) | |
| tree | f39b2b6d88c949dc69b3c752310d931b0516f871 /builtin/log.c | |
| parent | e216cc48daccf69c6de0c7fbb96c56f99197ca4c (diff) | |
| download | git-20b630aae924e35c24ee3d082362c36bee1c97b3.tar.gz git-20b630aae924e35c24ee3d082362c36bee1c97b3.tar.xz | |
format-patch: pick up correct branch name from symbolic ref
find_branch_name() assumes to take refs/heads/<branch>. But we also
have symbolic refs, such as HEAD, that can point to a valid branch in
refs/heads and do not follow refs/heads/<branch> syntax. Remove the
assumption and apply normal ref resolution. After all it would be
confusing if rev machinery resolves a ref in one way and
find_branch_name() another.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/builtin/log.c b/builtin/log.c index dff79212d..a293a3f05 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1014,8 +1014,8 @@ static char *find_branch_name(struct rev_info *rev) { int i, positive = -1; unsigned char branch_sha1[20]; - struct strbuf buf = STRBUF_INIT; - const char *branch; + const char *ref; + char *full_ref, *branch = NULL; for (i = 0; i < rev->cmdline.nr; i++) { if (rev->cmdline.rev[i].flags & UNINTERESTING) @@ -1027,16 +1027,13 @@ static char *find_branch_name(struct rev_info *rev) } if (positive < 0) return NULL; - strbuf_addf(&buf, "refs/heads/%s", rev->cmdline.rev[positive].name); - branch = resolve_ref_unsafe(buf.buf, branch_sha1, 1, NULL); - if (!branch || - prefixcmp(branch, "refs/heads/") || - hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1)) - branch = NULL; - strbuf_release(&buf); - if (branch) - return xstrdup(rev->cmdline.rev[positive].name); - return NULL; + ref = rev->cmdline.rev[positive].name; + if (dwim_ref(ref, strlen(ref), branch_sha1, &full_ref) && + !prefixcmp(full_ref, "refs/heads/") && + !hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1)) + branch = xstrdup(full_ref + strlen("refs/heads/")); + free(full_ref); + return branch; } int cmd_format_patch(int argc, const char **argv, const char *prefix) |