summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-01-03 16:16:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-03 17:01:38 (GMT)
commit5ee29aefac94d4ed11fc5101c89697f39057abb5 (patch)
tree5d3ed463fa858e2638497603af4513bd41a932ad /builtin/log.c
parent20b630aae924e35c24ee3d082362c36bee1c97b3 (diff)
downloadgit-5ee29aefac94d4ed11fc5101c89697f39057abb5.zip
git-5ee29aefac94d4ed11fc5101c89697f39057abb5.tar.gz
git-5ee29aefac94d4ed11fc5101c89697f39057abb5.tar.bz2
format-patch: pick up branch description when no ref is specified
We only try to get branch name in "format-patch origin" case or similar and not "format-patch -22" where HEAD is automatically added. Without correct branch name, branch description cannot be added. Make sure we always get branch name. 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.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c
index a293a3f..8f48885 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1014,6 +1014,7 @@ static char *find_branch_name(struct rev_info *rev)
{
int i, positive = -1;
unsigned char branch_sha1[20];
+ const unsigned char *tip_sha1;
const char *ref;
char *full_ref, *branch = NULL;
@@ -1025,12 +1026,24 @@ static char *find_branch_name(struct rev_info *rev)
else
return NULL;
}
- if (positive < 0)
+ if (0 <= positive) {
+ ref = rev->cmdline.rev[positive].name;
+ tip_sha1 = rev->cmdline.rev[positive].item->sha1;
+ } else if (!rev->cmdline.nr && rev->pending.nr == 1 &&
+ !strcmp(rev->pending.objects[0].name, "HEAD")) {
+ /*
+ * No actual ref from command line, but "HEAD" from
+ * rev->def was added in setup_revisions()
+ * e.g. format-patch --cover-letter -12
+ */
+ ref = "HEAD";
+ tip_sha1 = rev->pending.objects[0].item->sha1;
+ } else {
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))
+ !hashcmp(tip_sha1, branch_sha1))
branch = xstrdup(full_ref + strlen("refs/heads/"));
free(full_ref);
return branch;