diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-09-03 23:07:59 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-03 23:07:59 -0400 |
| commit | 4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa (patch) | |
| tree | cc25debce76b3b1d8120ca44ea954df29a1685ed /lib | |
| parent | 12fb223326b561132d528bb010c6bdeaa828acd3 (diff) | |
| parent | 047d94d505c9837a60c28e121de65471dadce74b (diff) | |
| download | git-4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Properly set the state of "Stage/Unstage Hunk" action
git-gui: Fix detaching current branch during checkout
git-gui: Correct starting of git-remote to handle -w option
Conflicts:
git-gui.sh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/checkout_op.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index b98c9cbcd8..f07262ca00 100644 --- a/lib/checkout_op.tcl +++ b/lib/checkout_op.tcl @@ -396,7 +396,7 @@ method _after_readtree {} { set is_detached 0 } } else { - if {$new_hash ne $HEAD} { + if {!$is_detached || $new_hash ne $HEAD} { append log " to $new_expr" if {[catch { _detach_HEAD $log $new_hash |