From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Tue, 4 Oct 2016 11:49:05 +0000 (+0100)
Subject: git-gui: maintain backwards compatibility for merge syntax
X-Git-Tag: gitgui-0.21.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82fbd8aedd0030b2ecbb16267ef1ce0179b4d601;p=thirdparty%2Fgit.git

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 <patthoyts@users.sourceforge.net>
---

diff --git a/lib/merge.tcl b/lib/merge.tcl
index 2b10a98389..9f253db5b3 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"]