1. Stefan Saasen
  2. git


Shawn O. Pearce  committed 84f6753

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>

  • Participants
  • Parent commits dac7089
  • Branches master
  • Tags gitgui-0.8.0

Comments (0)

Files changed (1)

File lib/merge.tcl

View file
  • Ignore whitespace
 	set spec [$w_rev get_tracking_branch]
 	set cmit [$w_rev get_commit]
-	set cmd [list git]
-	lappend cmd merge
-	lappend cmd --strategy=recursive
 	set fh [open [gitdir FETCH_HEAD] w]
 	fconfigure $fh -translation lf
 	puts $fh "$cmit\t\tbranch '$branch' of $remote"
 	close $fh
+	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 $cmit