git-gui: stop using deprecated merge syntax
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.s.r@web.de> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Sep 24, 2016 at 13:30 UTC
b5f325cb4a0d986689177857a62007027a532d31
1 file changed
+1
-6
lib/merge.tcl
+1
-6
@@ -112,12 +112,7 @@ method _start {} {
112
close $fh
113
set _last_merged_branch $branch
114
115
- set cmd [list git]
116
- lappend cmd merge
117
- lappend cmd --strategy=recursive
118
- lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
119
- lappend cmd HEAD
120
- lappend cmd $name
115
+ set cmd [list git merge --strategy=recursive FETCH_HEAD]
116
117
ui_status [mc "Merging %s and %s..." $current_branch $stitle]
118
set cons [console::new [mc "Merge"] "merge $stitle"]