summaryrefslogtreecommitdiff
path: root/git-gui/lib/checkout_op.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-18 06:50:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-18 06:50:17 (GMT)
commit9269df96105dff5ecc137b598ac7664d218ac6be (patch)
tree388409bbe67fafc18e79ae49a394643636e0711b /git-gui/lib/checkout_op.tcl
parentbe510cfef3d8344007bd34128ca6eb799b714c8c (diff)
parent3849bfba84fb5b0e9d46920f62105b4e1dd97e63 (diff)
downloadgit-9269df96105dff5ecc137b598ac7664d218ac6be.zip
git-9269df96105dff5ecc137b598ac7664d218ac6be.tar.gz
git-9269df96105dff5ecc137b598ac7664d218ac6be.tar.bz2
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: git-gui: Disable native platform text selection in "lists" git-gui: Paper bag fix "Commit->Revert" format arguments git-gui: Provide 'uninstall' Makefile target to undo an installation git-gui: Font chooser to handle a large number of font families git-gui: Make backporting changes from i18n version easier git-gui: Don't delete send on Windows as it doesn't exist git-gui: Trim trailing slashes from untracked submodule names git-gui: Assume untracked directories are Git submodules git-gui: handle "deleted symlink" diff marker git-gui: show unstaged symlinks in diff viewer git-gui: Avoid use of libdir in Makefile git-gui: Disable Tk send in all git-gui sessions git-gui: lib/index.tcl: handle files with % in the filename properly 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
Diffstat (limited to 'git-gui/lib/checkout_op.tcl')
-rw-r--r--git-gui/lib/checkout_op.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/checkout_op.tcl b/git-gui/lib/checkout_op.tcl
index 170f737..76f04f2 100644
--- a/git-gui/lib/checkout_op.tcl
+++ b/git-gui/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