summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-29 22:41:34 +1000
committerPaul Mackerras <paulus@samba.org>2007-08-29 22:41:34 +1000
commit719c2b9d926bf2be4879015e3620d27d32f007b6 (patch)
treee764eff873f0791587db4543cefb8c54420dbc82
parent887c996e4698dcb7ee95c48a98f7da2c3bae158b (diff)
downloadgit-719c2b9d926bf2be4879015e3620d27d32f007b6.tar.gz
gitk: Fix bug causing undefined variable error when cherry-picking
When "Show nearby tags" is turned off and the user did a cherry-pick, we were trying to access variables relating to the descendent/ancestor tag & head computations in addnewchild though they hadn't been set. This makes sure we don't do that. Reported by Johannes Sixt. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk3
1 files changed, 2 insertions, 1 deletions
diff --git a/gitk b/gitk
index b7730ae202..300fdceb35 100755
--- a/gitk
+++ b/gitk
@@ -6641,8 +6641,9 @@ proc splitarc {p} {
proc addnewchild {id p} {
global allids allparents allchildren idtags nextarc nbmp
global arcnos arcids arctags arcout arcend arcstart archeads growing
- global seeds
+ global seeds allcommits
+ if {![info exists allcommits]} return
lappend allids $id
set allparents($id) [list $p]
set allchildren($id) {}