From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: [PATCH/RFC] fmt-merge-msg: add a blank line after people info
Date: Fri, 11 May 2012 05:31:22 -0500 [thread overview]
Message-ID: <20120511103122.GA19573@burratino> (raw)
In-Reply-To: <7vipi9mfhx.fsf@alter.siamese.dyndns.org>
The new "credit people" feature in fmt-merge-msg changed the format of
a typical "merge --log" message from
Merge branch for-upstream of git://git.example.com/subsystem
* for-upstream: (51 commits)
foo: bar baz
to
Merge branch for-upstream of git://git.example.com/subsystem
By C O Ntributor
* for-upstream: (51 commits)
foo: bar baz
The message feels more natural with a line of breathing room before
the list of one-line descriptions headed by the branch name, like
messages already get when attached to a merge by "fmt-merge-msg -m" or
automatically incorporated during a merge of an annotated tag.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Hi again,
Junio C Hamano wrote:
> I'd hold making that judgement for a several weeks until my eyes get
> used to if I were you.
Turns out my reaction is pretty much the same as before. I still like
the idea and still am distracted by the spacing. After the small
patch below, the log seems peaceful again and I am totally fine with
it.
Merge branch for-upstream of git://git.example.com/subsystem
By Fred the Clown
* for-upstream: (51 commits)
foo: bar baz
Hope that helps,
Jonathan
builtin/fmt-merge-msg.c | 5 +++++
t/t6200-fmt-merge-msg.sh | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 1bc6b8b8..8f228781 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -264,6 +264,8 @@ static void add_people_info(struct strbuf *out,
struct string_list *authors,
struct string_list *committers)
{
+ size_t pos = out->len;
+
if (authors->nr)
qsort(authors->items,
authors->nr, sizeof(authors->items[0]),
@@ -275,6 +277,9 @@ static void add_people_info(struct strbuf *out,
credit_people(out, authors, 'a');
credit_people(out, committers, 'c');
+
+ if (out->len > pos)
+ strbuf_addch(out, '\n');
}
static void shortlog(const char *name,
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 9b50f54c..d39417ba 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -104,6 +104,7 @@ test_expect_success '[merge] summary/log configuration' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left:
Left #5
Left #4
@@ -151,6 +152,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left: (5 commits)
Left #5
Left #4
@@ -168,6 +170,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left:
Left #5
Left #4
@@ -192,6 +195,7 @@ test_expect_success '--log=3 limits shortlog length' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left: (5 commits)
Left #5
Left #4
@@ -209,6 +213,7 @@ test_expect_success '--log=5 shows all 5 commits' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left:
Left #5
Left #4
@@ -240,6 +245,7 @@ test_expect_success 'fmt-merge-msg -m' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* ${apos}left${apos} of $(pwd):
Left #5
Left #4
@@ -273,6 +279,7 @@ test_expect_success 'setup: expected shortlog for two branches' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left:
Left #5
Left #4
@@ -398,6 +405,7 @@ test_expect_success 'merge-msg two tags' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* tag ${apos}tag-l5${apos}:
Left #5
Left #4
@@ -428,6 +436,7 @@ test_expect_success 'merge-msg tag and branch' '
By Another Author (3) and A U Thor (2)
via Another Committer
+
* left:
Left #5
Left #4
--
1.7.10.1
next prev parent reply other threads:[~2012-05-11 10:31 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 3:17 A possible fmt-merge-msg update? Junio C Hamano
2012-03-05 5:24 ` Linus Torvalds
2012-03-05 19:04 ` Junio C Hamano
2012-03-05 20:33 ` Linus Torvalds
2012-03-05 21:34 ` [PATCH] fmt-merge-msg: show those involved in a merged series Junio C Hamano
2012-03-05 21:46 ` Linus Torvalds
2012-03-05 21:49 ` Junio C Hamano
2012-03-07 21:22 ` René Scharfe
2012-03-07 21:59 ` Junio C Hamano
2012-03-08 17:46 ` René Scharfe
2012-03-08 19:18 ` Junio C Hamano
2012-03-08 21:31 ` Junio C Hamano
2012-03-12 21:37 ` Phil Hord
2012-03-13 21:03 ` Jeff King
2012-03-14 3:44 ` Junio C Hamano
2012-03-14 19:12 ` Phil Hord
2012-03-12 7:11 ` Jonathan Nieder
2012-03-13 1:55 ` Junio C Hamano
2012-03-13 5:23 ` Jonathan Nieder
2012-03-13 5:45 ` Junio C Hamano
2012-03-13 7:27 ` Johannes Sixt
2012-03-13 18:26 ` Junio C Hamano
2012-03-14 6:37 ` Johannes Sixt
2012-03-14 20:34 ` Junio C Hamano
2012-03-13 18:28 ` [PATCH v2 1/1] " Junio C Hamano
2012-05-11 10:31 ` Jonathan Nieder [this message]
2012-05-11 22:46 ` [PATCH/RFC] fmt-merge-msg: add a blank line after people info Junio C Hamano
2012-05-11 23:20 ` Linus Torvalds
2012-05-14 18:31 ` Junio C Hamano
2012-05-15 20:24 ` Junio C Hamano
2012-05-16 2:02 ` Linus Torvalds
2012-05-16 17:28 ` Junio C Hamano
2012-06-06 20:27 ` Jonathan Nieder
2012-06-06 20:46 ` Jonathan Nieder
2012-06-06 21:11 ` Junio C Hamano
2012-03-06 7:59 ` A possible fmt-merge-msg update? Jeff King
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=20120511103122.GA19573@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.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).