From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/3] format-patch: pick up branch description when no ref is specified
Date: Tue, 1 Jan 2013 16:30:54 +0700 [thread overview]
Message-ID: <1357032655-21103-2-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1357032655-21103-1-git-send-email-pclouds@gmail.com>
find_branch_name() fails to detect "format-patch --cover-letter -3"
where no command line arguments are given and HEAD is automatically
added. Detect branch name in this case so we can pick up the branch's
description in cover letter.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/log.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c
index e7b7db1..115f118 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1027,8 +1027,22 @@ static char *find_branch_name(struct rev_info *rev)
else
return NULL;
}
- if (positive < 0)
+ if (positive < 0) {
+ /*
+ * No actual ref from command line, but "HEAD" from
+ * rev->def was added in setup_revisions()
+ * e.g. format-patch --cover-letter -12
+ */
+ if (!rev->cmdline.nr &&
+ rev->pending.nr == 1 &&
+ !strcmp(rev->pending.objects[0].name, "HEAD")) {
+ const char *ref;
+ ref = resolve_ref_unsafe("HEAD", branch_sha1, 1, NULL);
+ if (ref && !prefixcmp(ref, "refs/heads/"))
+ return xstrdup(ref + strlen("refs/heads/"));
+ }
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 ||
--
1.8.0.rc2.23.g1fb49df
next prev parent reply other threads:[~2013-01-01 9:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-01 9:30 [PATCH 1/3] config.txt: a few lines about branch.<name>.description Nguyễn Thái Ngọc Duy
2013-01-01 9:30 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-01 20:38 ` [PATCH 2/3] format-patch: pick up branch description when no ref is specified Junio C Hamano
2013-01-02 1:25 ` Duy Nguyen
2013-01-01 9:30 ` [PATCH 3/3] branch: delete branch description if it's empty Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357032655-21103-2-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).