mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Fix detaching current branch during checkout

Browse Source 
If the user tried to detach their HEAD while keeping the working
directory on the same commit we actually did not completely do
a detach operation internally.  The problem was caused by git-gui
not forcing the HEAD symbolic ref to be updated to a SHA-1 hash
when we were not switching revisions.  Now we update the HEAD ref
if we aren't currently detached or the hashes don't match.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-09-02 15:30:26 -04:00
parent 6e4ba05c7f
commit 881d8f24ca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkout_op.tcl
View File

@ -396,7 +396,7 @@ method _after_readtree {} {
set is_detached 0 set is_detached 0
} }
} else { } else {
if {$new_hash ne $HEAD} { if {!$is_detached || $new_hash ne $HEAD} {
append log " to $new_expr" append log " to $new_expr"
if {[catch { if {[catch {
_detach_HEAD $log $new_hash _detach_HEAD $log $new_hash