From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 3 Dec 2008 12:43:20 +0000 (+0100)
Subject: gitk: Ensure that "Reset branch" menu entry is enabled
X-Git-Tag: v1.6.1-rc4~6^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=da12e59dd6732f2f6dfe6285193dbebe9cd5a91b;p=git.git

gitk: Ensure that "Reset branch" menu entry is enabled

Consider this sequence of events:

1. Detach HEAD and fire up gitk
2. Call the context menu on some commit. Notice that the last menu entry
   says "Detached HEAD: can't reset" and it is disabled.
3. Now checkout some regular branch (e.g. 'master') using the context menu.
4. Call the context menu again on some commit.

Previously, at this point the last menu entry said "Reset master branch
to here", but it was still disabled. With this fix it is now enabled again.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index acda29571..2feb667d5 100755
--- a/gitk
+++ b/gitk
@@ -7979,7 +7979,7 @@ proc rowmenu {x y id} {
     if {$id ne $nullid && $id ne $nullid2} {
 	set menu $rowctxmenu
 	if {$mainhead ne {}} {
-	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
+	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
 	} else {
 	    $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
 	}