diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-30 00:21:54 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-30 03:44:52 (GMT) |
| commit | 84f67537b13bf0a959b1cad50b0d490071dc921a (patch) | |
| tree | 8b19121e813e149512428e0d510d20a29576bb55 | |
| parent | dac70892638d08f50c49c539155c4cb54a9b9c28 (diff) | |
| download | git-84f67537b13bf0a959b1cad50b0d490071dc921a.zip git-84f67537b13bf0a959b1cad50b0d490071dc921a.tar.gz git-84f67537b13bf0a959b1cad50b0d490071dc921a.tar.bz2 | |
git-gui: Minor refactoring of merge command line in merge supportgitgui-0.8.0
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>
| -rw-r--r-- | lib/merge.tcl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 66d1bcd..5de0d82 100644 --- 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 |