@matheusbsbs / matheus-bagliano / commits / 84f67537b1
Fork 0

git-gui: Minor refactoring of merge command line in merge support

This is just a small code movement to cleanup how we generate the command line for a merge. I'm only doing it to make the next series of changes slightly more readable. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jul 29, 2007 at 20:21 UTC 84f67537b13bf0a959b1cad50b0d490071dc921a
1 file changed +3 -3
lib/merge.tcl
+3 -3
@@ -90,9 +90,6 @@ method _start {} {
90
91 set spec [$w_rev get_tracking_branch]
92 set cmit [$w_rev get_commit]
93 - set cmd [list git]
94 - lappend cmd merge
95 - lappend cmd --strategy=recursive
93
94 set fh [open [gitdir FETCH_HEAD] w]
95 fconfigure $fh -translation lf
@@ -112,6 +109,9 @@ method _start {} {
109 puts $fh "$cmit\t\tbranch '$branch' of $remote"
110 close $fh
111
112 + set cmd [list git]
113 + lappend cmd merge
114 + lappend cmd --strategy=recursive
115 lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
116 lappend cmd HEAD
117 lappend cmd $cmit