diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-04 12:49:05 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-04 23:14:05 +0100 |
| commit | 82fbd8aedd0030b2ecbb16267ef1ce0179b4d601 (patch) | |
| tree | 32be820f572c6a050cd705c0920de624c2f8ed3f | |
| parent | 52f2445d5c70a204f614fd83cf98a27359dff04c (diff) | |
| download | git-82fbd8aedd0030b2ecbb16267ef1ce0179b4d601.tar.gz git-82fbd8aedd0030b2ecbb16267ef1ce0179b4d601.tar.xz | |
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>
| -rw-r--r-- | lib/merge.tcl | 11 |
1 files changed, 10 insertions, 1 deletions
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"] |