Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Minor refactoring of merge command line in merge support
author
Shawn O. Pearce
<spearce@spearce.org>
Mon, 30 Jul 2007 00:21:54 +0000
(20:21 -0400)
committer
Shawn O. Pearce
<spearce@spearce.org>
Mon, 30 Jul 2007 03:44:52 +0000
(23:44 -0400)
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>
lib/merge.tcl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
dac7089
)
diff --git
a/lib/merge.tcl
b/lib/merge.tcl
index 66d1bcd8263e4a346993d9cfa99cbde080959a7b..5de0d82b1486ef6ff8ce0eaea4221fa393a87d5b 100644
(file)
--- a/
lib/merge.tcl
+++ b/
lib/merge.tcl
@@
-90,9
+90,6
@@
method _start {} {
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
@@
-112,6
+109,9
@@
method _start {} {
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