mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fmt-merge-msg-people'

Browse Source 
Tone down the lines that credit people involved and make them
comments, so that integrators who edit their merge messages can
still make use of the information, but lazy ones will not leave
the unverified guesses placed on the "via" line.

* jc/fmt-merge-msg-people:
  fmt-merge-msg: make attribution into comment lines
This commit is contained in:
Junio C Hamano
2012-06-12 08:33:30 -07:00
parent 87725757af 9830a9ca50
commit d844808bb2
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fmt-merge-msg.c
View File

@ -286,10 +286,10 @@ static void credit_people(struct strbuf *out,
const char *me; const char *me;
if (kind == 'a') { if (kind == 'a') {
label = "\nBy "; label = "\n# By ";
me = git_author_info(IDENT_NO_DATE); me = git_author_info(IDENT_NO_DATE);
} else { } else {
label = "\nvia "; label = "\n# Via ";
me = git_committer_info(IDENT_NO_DATE); me = git_committer_info(IDENT_NO_DATE);
} }

36
t/t6200-fmt-merge-msg.sh
View File

@ -102,8 +102,8 @@ test_expect_success '[merge] summary/log configuration' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4
@ -149,8 +149,8 @@ test_expect_success 'merge.log=3 limits shortlog length' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: (5 commits) * left: (5 commits)
Left #5 Left #5
Left #4 Left #4
@ -166,8 +166,8 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4
@ -190,8 +190,8 @@ test_expect_success '--log=3 limits shortlog length' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: (5 commits) * left: (5 commits)
Left #5 Left #5
Left #4 Left #4
@ -207,8 +207,8 @@ test_expect_success '--log=5 shows all 5 commits' '
cat >expected <<-EOF && cat >expected <<-EOF &&
Merge branch ${apos}left${apos} Merge branch ${apos}left${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4
@ -238,8 +238,8 @@ test_expect_success 'fmt-merge-msg -m' '
cat >expected.log <<-EOF && cat >expected.log <<-EOF &&
Sync with left Sync with left
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* ${apos}left${apos} of $(pwd): * ${apos}left${apos} of $(pwd):
Left #5 Left #5
Left #4 Left #4
@ -271,8 +271,8 @@ test_expect_success 'setup: expected shortlog for two branches' '
cat >expected <<-EOF cat >expected <<-EOF
Merge branches ${apos}left${apos} and ${apos}right${apos} Merge branches ${apos}left${apos} and ${apos}right${apos}
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4
@ -396,8 +396,8 @@ test_expect_success 'merge-msg two tags' '
Common #2 Common #2
Common #1 Common #1
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* tag ${apos}tag-l5${apos}: * tag ${apos}tag-l5${apos}:
Left #5 Left #5
Left #4 Left #4
@ -426,8 +426,8 @@ test_expect_success 'merge-msg tag and branch' '
Common #2 Common #2
Common #1 Common #1
By Another Author (3) and A U Thor (2) # By Another Author (3) and A U Thor (2)
via Another Committer # Via Another Committer
* left: * left:
Left #5 Left #5
Left #4 Left #4