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>
Pat Thoyts committed
Oct 4, 2016 at 12:49 UTC
82fbd8aedd0030b2ecbb16267ef1ce0179b4d601
1 file changed
+10
-1
lib/merge.tcl
+10
-1
@@ -112,7 +112,16 @@ method _start {} {
112
close $fh
113
set _last_merged_branch $branch
114
115
- set cmd [list git merge --strategy=recursive FETCH_HEAD]
115
+ if {[git-version >= "2.5.0"]} {
116
+ set cmd [list git merge --strategy=recursive FETCH_HEAD]
117
+ } else {
118
+ set cmd [list git]
119
+ lappend cmd merge
120
+ lappend cmd --strategy=recursive
121
+ lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
122
+ lappend cmd HEAD
123
+ lappend cmd $name
124
+ }
125
126
ui_status [mc "Merging %s and %s..." $current_branch $stitle]
127
set cons [console::new [mc "Merge"] "merge $stitle"]