git-gui: do not use obsolete `git merge $msg HEAD $branch'

PATCH New Johannes Sixt 1 participant 1 message Jun 15, 2016 Library code

lore

Share & tools

lore

Johannes Sixt

author

2016-06-15 23:07 UTC #0 lore raw

PATCH 1/1 git-gui: do not use obsolete `git merge $msg HEAD $branch'

Use the modern `git merge' invocation pattern.

Since both git merge' and git fmt-merge-msg' obey the merge.log configuration, instruct the former not to generate the log summary to avoid that it appears twice in the commit message.

Signed-off-by Johannes Sixt <[email protected]>

---
 lib/merge.tcl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

lib/merge.tcl +2 -1

index 460d32f..f512456 100644
@@ -115,8 +115,9 @@ method _start {} {
 	set cmd [list git]
 	lappend cmd merge
 	lappend cmd --strategy=recursive
+	lappend cmd --no-log
+	lappend cmd -m
 	lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
-	lappend cmd HEAD
 	lappend cmd $name
 
 	ui_status [mc "Merging %s and %s..." $current_branch $stitle]

Signature · 1 line

2.6.2.337.ga235d84