From: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.de>
To: git@vger.kernel.org
Subject: [RFC 3/3] log: add an option to generate cover letter from a branch tip
Date: Mon, 13 Nov 2017 18:13:39 +0100 [thread overview]
Message-ID: <936c2b33-3432-f113-d84b-0623246ec673@suse.de> (raw)
In-Reply-To: <xmqqbmk68o9d.fsf@gitster.mtv.corp.google.com>
TODO: figure out defaults, add a config option, move tip detection to specific function
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
---
Documentation/git-format-patch.txt | 4 ++++
builtin/log.c | 44 +++++++++++++++++++++++++++++---------
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 6cbe462a7..0ac9d4b71 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -228,6 +228,10 @@ feeding the result to `git send-email`.
containing the branch description, shortlog and the overall diffstat. You can
fill in a description in the file before sending it out.
+--[no-]cover-letter-at-tip::
+ Use the tip of the series as a cover letter if it is an empty commit.
+ If no cover-letter is to be sent, the tip is ignored.
+
--notes[=<ref>]::
Append the notes (see linkgit:git-notes[1]) for the commit
after the three-dash line.
diff --git a/builtin/log.c b/builtin/log.c
index 6c1fa896a..292626482 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -986,11 +986,11 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct commit *origin,
int nr, struct commit **list,
const char *branch_name,
- int quiet)
+ int quiet,
+ struct commit *cover_at_tip_commit)
{
const char *committer;
- const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
- const char *msg;
+ const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n\n";
struct shortlog log;
struct strbuf sb = STRBUF_INIT;
int i;
@@ -1021,17 +1021,21 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
if (!branch_name)
branch_name = find_branch_name(rev);
- msg = body;
pp.fmt = CMIT_FMT_EMAIL;
pp.date_mode.type = DATE_RFC2822;
pp.rev = rev;
pp.print_email_subject = 1;
- pp_user_info(&pp, NULL, &sb, committer, encoding);
- pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
- pp_remainder(&pp, &msg, &sb, 0);
- add_branch_description(&sb, branch_name);
- fprintf(rev->diffopt.file, "%s\n", sb.buf);
+ if (!cover_at_tip_commit) {
+ pp_user_info(&pp, NULL, &sb, committer, encoding);
+ pp_title_line(&pp, &body, &sb, encoding, need_8bit_cte);
+ pp_remainder(&pp, &body, &sb, 0);
+ } else {
+ pretty_print_commit(&pp, cover_at_tip_commit, &sb);
+ }
+ add_branch_description(&sb, branch_name);
+ fprintf(rev->diffopt.file, "%s", sb.buf);
+ fprintf(rev->diffopt.file, "---\n", sb.buf);
strbuf_release(&sb);
shortlog_init(&log);
@@ -1409,6 +1413,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int just_numbers = 0;
int ignore_if_in_upstream = 0;
int cover_letter = -1;
+ int cover_at_tip = -1;
+ struct commit *cover_at_tip_commit = NULL;
int boundary_count = 0;
int no_binary_diff = 0;
int zero_commit = 0;
@@ -1437,6 +1443,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
N_("print patches to standard out")),
OPT_BOOL(0, "cover-letter", &cover_letter,
N_("generate a cover letter")),
+ OPT_BOOL(0, "cover-at-tip", &cover_at_tip,
+ N_("fill the cover letter with the tip of the branch")),
OPT_BOOL(0, "numbered-files", &just_numbers,
N_("use simple number sequence for output file names")),
OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),
@@ -1698,6 +1706,21 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids))
continue;
+ if (!nr && cover_at_tip == 1 && !cover_at_tip_commit) {
+ /* Check that it is a candidate to be a cover at tip
+ * Meaning:
+ * - a single parent (merge commits are not eligible)
+ * - tree oid == parent->tree->oid (no diff to the tree)
+ */
+ if (commit->parents && !commit->parents->next &&
+ !oidcmp(&commit->tree->object.oid,
+ &commit->parents->item->tree->object.oid)) {
+ cover_at_tip_commit = commit;
+ continue;
+ } else {
+ cover_at_tip = 0;
+ }
+ }
nr++;
REALLOC_ARRAY(list, nr);
list[nr - 1] = commit;
@@ -1748,7 +1771,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (thread)
gen_message_id(&rev, "cover");
make_cover_letter(&rev, use_stdout,
- origin, nr, list, branch_name, quiet);
+ origin, nr, list, branch_name, quiet,
+ cover_at_tip_commit);
print_bases(&bases, rev.diffopt.file);
print_signature(rev.diffopt.file);
total++;
--
2.15.0.169.g3d3eebb67.dirty
next prev parent reply other threads:[~2017-11-13 17:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 10:24 [RFC] cover-at-tip Nicolas Morey-Chaisemartin
2017-11-10 15:37 ` Nicolas Morey-Chaisemartin
2017-11-10 18:22 ` Junio C Hamano
2017-11-13 7:58 ` Nicolas Morey-Chaisemartin
2017-11-13 9:48 ` Junio C Hamano
2017-11-13 10:30 ` Junio C Hamano
2017-11-13 10:48 ` Nicolas Morey-Chaisemartin
2017-11-13 17:13 ` [RFC 0/3] Add support for --cover-at-tip Nicolas Morey-Chaisemartin
2017-11-13 19:40 ` Jonathan Tan
2017-11-13 19:53 ` Nicolas Morey-Chaisemartin
2017-11-13 17:13 ` [RFC 1/3] mailinfo: extract patch series id Nicolas Morey-Chaisemartin
2017-11-14 5:47 ` Junio C Hamano
2017-11-14 9:10 ` Nicolas Morey-Chaisemartin
2017-11-13 17:13 ` [RFC 2/3] am: semi working --cover-at-tip Nicolas Morey-Chaisemartin
2017-11-14 6:00 ` Junio C Hamano
2017-11-14 9:17 ` Nicolas Morey-Chaisemartin
2017-11-16 16:21 ` Nicolas Morey-Chaisemartin
2017-11-17 1:54 ` Junio C Hamano
2017-11-13 17:13 ` Nicolas Morey-Chaisemartin [this message]
2017-11-14 6:14 ` [RFC 3/3] log: add an option to generate cover letter from a branch tip Junio C Hamano
2017-11-14 9:28 ` Nicolas Morey-Chaisemartin
2017-11-14 13:05 ` Junio C Hamano
2017-11-14 13:40 ` Nicolas Morey-Chaisemartin
2017-11-14 14:52 ` Junio C Hamano
2017-11-10 18:28 ` [RFC] cover-at-tip Jonathan Tan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=936c2b33-3432-f113-d84b-0623246ec673@suse.de \
--to=nmoreychaisemartin@suse.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).