{"thread":{"id":"41025","subject":"[PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'","startedAt":"2015-12-16T21:44:08Z","lastAt":"2015-12-16T21:44:08Z","messageCount":1,"participants":["Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"274609","messageId":"5671DB28.8020901@kdbg.org","threadId":"41025","inReplyTo":null,"subject":"[PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2015-12-16T21:44:08Z","receivedAt":"2015-12-16T21:44:08Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Use the modern `git merge' invocation pattern.\n\nSince both `git merge' and `git fmt-merge-msg' obey the merge.log\nconfiguration, instruct the former not to generate the log summary to\navoid that it appears twice in the commit message.\n\nSigned-off-by: Johannes Sixt <j6t@kdbg.org>\n---\n lib/merge.tcl | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/lib/merge.tcl b/lib/merge.tcl\nindex 460d32f..f512456 100644\n--- a/lib/merge.tcl\n+++ b/lib/merge.tcl\n@@ -115,8 +115,9 @@ method _start {} {\n \tset cmd [list git]\n \tlappend cmd merge\n \tlappend cmd --strategy=recursive\n+\tlappend cmd --no-log\n+\tlappend cmd -m\n \tlappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]\n-\tlappend cmd HEAD\n \tlappend cmd $name\n \n \tui_status [mc \"Merging %s and %s...\" $current_branch $stitle]\n-- \n2.6.2.337.ga235d84\n"}]}