summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-20 08:10:13 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-21 09:00:37 (GMT)
commit54febd4fe62cc32b1337cd928af17a5a09624d74 (patch)
treeef5ffe14721a55768161d15b361cd752e6c149c3
parentdba07411da8debf9e39bf8d28f642b09c5794aff (diff)
downloadgit-54febd4fe62cc32b1337cd928af17a5a09624d74.zip
git-54febd4fe62cc32b1337cd928af17a5a09624d74.tar.gz
git-54febd4fe62cc32b1337cd928af17a5a09624d74.tar.bz2
git-gui: Internally allow fetch without storing for future pull support
This is actually just an underlying code improvement that has no user visible component yet. UI improvements to actually fetch and merge via an arbitrary remote with no tracking branches must still follow to make this change useful for the end-user. Our tracking branch specifications are a Tcl list of three components: - local tracking branch name - remote name/url - remote branch name/tag name This change just makes the first element optional. If it is an empty string we will run the fetch, but have the value be saved only into the special .git/FETCH_HEAD, where we can pick it up and use it for this one time operation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--lib/checkout_op.tcl14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index cb04d1e..0571115 100644
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -66,14 +66,19 @@ method run {} {
set r_head [lindex $fetch_spec 2]
regsub ^refs/heads/ $r_head {} r_name
+ set cmd [list git fetch $remote]
+ if {$l_trck ne {}} {
+ lappend cmd +$r_head:$l_trck
+ } else {
+ lappend cmd $r_head
+ }
+
_toplevel $this {Refreshing Tracking Branch}
set w_cons [::console::embed \
$w.console \
"Fetching $r_name from $remote"]
pack $w.console -fill both -expand 1
- $w_cons exec \
- [list git fetch $remote +$r_head:$l_trck] \
- [cb _finish_fetch]
+ $w_cons exec $cmd [cb _finish_fetch]
bind $w <$M1B-Key-w> break
bind $w <$M1B-Key-W> break
@@ -114,6 +119,9 @@ method _noop {} {}
method _finish_fetch {ok} {
if {$ok} {
set l_trck [lindex $fetch_spec 0]
+ if {$l_trck eq {}} {
+ set l_trck FETCH_HEAD
+ }
if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
set ok 0
$w_cons insert "fatal: Cannot resolve $l_trck"