summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeat Bolli <dev+git@drbeat.li>2015-09-08 01:16:37 +0200
committerPaul Mackerras <paulus@samba.org>2015-09-13 15:00:30 +1000
commitb6f92a8563cedc67915a038e441b0440e692f5dc (patch)
tree695a0046e0b959dfdf1be3d235bc923b01bae6a5
parentd835dbb91fe246d123dc81f6a317d73518ecef46 (diff)
downloadgit-b6f92a8563cedc67915a038e441b0440e692f5dc.tar.gz
gitk: Adjust the menu line numbers to compensate for the new entry
Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitk b/gitk
index 51520effbe..8e78f94890 100755
--- a/gitk
+++ b/gitk
@@ -8896,13 +8896,13 @@ 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] -state normal
+ $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal
} else {
- $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
+ $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled
}
- $menu entryconfigure 9 -state $mstate
$menu entryconfigure 10 -state $mstate
$menu entryconfigure 11 -state $mstate
+ $menu entryconfigure 12 -state $mstate
} else {
set menu $fakerowmenu
}