Commits

Anonymous committed d844808 Merge

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

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

Comments (0)

Files changed (2)

builtin/fmt-merge-msg.c

 	const char *me;
 
 	if (kind == 'a') {
-		label = "\nBy ";
+		label = "\n# By ";
 		me = git_author_info(IDENT_NO_DATE);
 	} else {
-		label = "\nvia ";
+		label = "\n# Via ";
 		me = git_committer_info(IDENT_NO_DATE);
 	}
 

t/t6200-fmt-merge-msg.sh

 	cat >expected <<-EOF &&
 	Merge branch ${apos}left${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left:
 	  Left #5
 	  Left #4
 	cat >expected <<-EOF &&
 	Merge branch ${apos}left${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left: (5 commits)
 	  Left #5
 	  Left #4
 	cat >expected <<-EOF &&
 	Merge branch ${apos}left${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left:
 	  Left #5
 	  Left #4
 	cat >expected <<-EOF &&
 	Merge branch ${apos}left${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left: (5 commits)
 	  Left #5
 	  Left #4
 	cat >expected <<-EOF &&
 	Merge branch ${apos}left${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left:
 	  Left #5
 	  Left #4
 	cat >expected.log <<-EOF &&
 	Sync with left
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* ${apos}left${apos} of $(pwd):
 	  Left #5
 	  Left #4
 	cat >expected <<-EOF
 	Merge branches ${apos}left${apos} and ${apos}right${apos}
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left:
 	  Left #5
 	  Left #4
 	  Common #2
 	  Common #1
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* tag ${apos}tag-l5${apos}:
 	  Left #5
 	  Left #4
 	  Common #2
 	  Common #1
 
-	By Another Author (3) and A U Thor (2)
-	via Another Committer
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
 	* left:
 	  Left #5
 	  Left #4
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.