Anonymous avatar Anonymous 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>;

Comments (0)

Files changed (1)

 
 	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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.