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@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html