From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC 3/3] log: add an option to generate cover letter from a branch tip
Date: Tue, 14 Nov 2017 15:14:33 +0900 [thread overview]
Message-ID: <xmqq7eut4cae.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <936c2b33-3432-f113-d84b-0623246ec673@suse.de> (Nicolas Morey-Chaisemartin's message of "Mon, 13 Nov 2017 18:13:39 +0100")
Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.de> writes:
> - const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
> - const char *msg;
> + const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n\n";
Hmmmm.
> @@ -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);
I would have expected that this feature would not change anything
other than replacing the constant string *body we unconditionally
print with the log message of the empty commit at the tip, so from
that expectation, I was hoping that a patch looked nothing more than
this:
builtin/log.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c
index 6c1fa896ad..0af19d5b36 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -986,6 +986,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct commit *origin,
int nr, struct commit **list,
const char *branch_name,
+ struct commit *cover,
int quiet)
{
const char *committer;
@@ -1021,7 +1022,10 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
if (!branch_name)
branch_name = find_branch_name(rev);
- msg = body;
+ if (cover)
+ msg = get_cover_from_commit(cover);
+ else
+ msg = body;
pp.fmt = CMIT_FMT_EMAIL;
pp.date_mode.type = DATE_RFC2822;
pp.rev = rev;
plus a newly written function get_cover_from_commit(). Why does
this patch need to change a lot more than that, I have to wonder.
This is totally unrelated, but I wonder if it makes sense to do
something similar for branch.description, too. If the user has a
meaningful description prepared with "git branch --edit-desc", it is
somewhat insulting to the user to still add "*** BLURB HERE ***".
next prev parent reply other threads:[~2017-11-14 6:14 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 ` [RFC 3/3] log: add an option to generate cover letter from a branch tip Nicolas Morey-Chaisemartin
2017-11-14 6:14 ` Junio C Hamano [this message]
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=xmqq7eut4cae.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=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).