kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
main^2
René Scharfe 2016-09-24 13:30:22 +02:00 committed by Junio C Hamano
parent 4498b3a50a
commit b5f325cb4a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/merge.tcl
View File

@ -112,12 +112,7 @@ method _start {} {
close $fh close $fh
set _last_merged_branch $branch set _last_merged_branch $branch


set cmd [list git] set cmd [list git merge --strategy=recursive FETCH_HEAD]
lappend cmd merge
lappend cmd --strategy=recursive
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] ui_status [mc "Merging %s and %s..." $current_branch $stitle]
set cons [console::new [mc "Merge"] "merge $stitle"] set cons [console::new [mc "Merge"] "merge $stitle"]