diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-07-20 03:56:06 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-21 05:00:37 -0400 |
| commit | dba07411da8debf9e39bf8d28f642b09c5794aff (patch) | |
| tree | 51fbdef4f9db9ccfd33ee6ac849d9ec1661f77fd | |
| parent | git-gui: Simplify error case for unsupported merge types (diff) | |
| download | tgif-dba07411da8debf9e39bf8d28f642b09c5794aff.tar.xz | |
git-gui: Skip unnecessary read-tree work during checkout
I totally missed this obvious optimization in the checkout code path.
If our current repository HEAD is actually at the commit we are moving
to, and we agreed to perform this switch earlier, then we have no files
to update in the working directory and any stale mtimes are simply not
of consequence right now. We can pretend like we ran a read-tree and
skip right into the post-read-tree work, such as updating the branch
and setting the symbolic-ref.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | lib/checkout_op.tcl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index 554c107032..cb04d1e57e 100644 --- a/lib/checkout_op.tcl +++ b/lib/checkout_op.tcl @@ -266,7 +266,9 @@ The rescan will be automatically started now. return } - if {[is_config_true gui.trustmtime]} { + if {$curHEAD eq $new_hash} { + _after_readtree $this + } elseif {[is_config_true gui.trustmtime]} { _readtree $this } else { ui_status {Refreshing file status...} |