]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-gui: git merge understands --strategy=recursive
authorMark Levedahl <mlevedahl@gmail.com>
Tue, 13 Feb 2024 05:13:10 +0000 (00:13 -0500)
committerMark Levedahl <mlevedahl@gmail.com>
Sat, 19 Jul 2025 03:48:06 +0000 (23:48 -0400)
git-gui's merge driver includes code to invoke the recursive strategy
for merging prior to git v2.5 that added a simpler syntax. As git-gui
requires git v2.36 or later, let's delete the code targeting earlier
git.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
lib/merge.tcl

index 44c3f93584224cdd5d2f6f746f16bbffaace5db0..375fa19a12fa42a746667ca57a4204ee9326ff50 100644 (file)
@@ -112,16 +112,7 @@ method _start {} {
        close $fh
        set _last_merged_branch $branch
 
-       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_redir [list fmt-merge-msg] [list <[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"]