Am 24.09.2016 um 13:30 schrieb René Scharfe:
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and warns when it's called like 'git merge <message> HEAD <commit>' because that syntax is deprecated. Use this feature in git-gui and get rid of that warning.Signed-off-by: Rene Scharfe <l....@web.de> --- Tested only _very_ lightly! git-gui/lib/merge.tcl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 460d32f..5ab6f8f 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -112,12 +112,7 @@ method _start {} { close $fh set _last_merged_branch $branch - set cmd [list git] - lappend cmd merge - lappend cmd --strategy=recursive - lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] - lappend cmd HEAD - lappend cmd $name + set cmd [list git merge --strategy=recursive FETCH_HEAD] ui_status [mc "Merging %s and %s..." $current_branch $stitle] set cons [console::new [mc "Merge"] "merge $stitle"]
Much better than my version. I had left fmt-merge-msg and added --no-log to treat merge.log config suitably. But this works too, and is much more obvious.
Tested-by: Johannes Sixt <j...@kdbg.org> -- Hannes
