diff options
| author | René Scharfe <l.s.r@web.de> | 2016-09-24 13:30:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 07:15:28 -0700 |
| commit | b5f325cb4a0d986689177857a62007027a532d31 (patch) | |
| tree | f15141910d7be6a63656a2fd06cea2351affa25c | |
| parent | 4498b3a50a0e839788682f672df267cbc1ba9292 (diff) | |
| download | git-b5f325cb4a0d986689177857a62007027a532d31.tar.gz | |
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>
| -rw-r--r-- | lib/merge.tcl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 460d32fa22..5ab6f8f102 100644 --- a/lib/merge.tcl +++ b/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"] |