From 82fbd8aedd0030b2ecbb16267ef1ce0179b4d601 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Tue, 4 Oct 2016 12:49:05 +0100 Subject: [PATCH] git-gui: maintain backwards compatibility for merge syntax Commit b5f325c updated to use the newer merge syntax but continue to support older versions of git. Signed-off-by: Pat Thoyts --- lib/merge.tcl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/merge.tcl b/lib/merge.tcl index 2b10a9838..9f253db5b 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -112,7 +112,16 @@ method _start {} { close $fh set _last_merged_branch $branch - set cmd [list git merge --strategy=recursive FETCH_HEAD] + if {[git-version >= "2.5.0"]} { + set cmd [list git merge --strategy=recursive FETCH_HEAD] + } else { + 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 + } ui_status [mc "Merging %s and %s..." $current_branch $stitle] set cons [console::new [mc "Merge"] "merge $stitle"] -- 2.11.0