summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-08-29 13:27:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-29 13:27:10 -0700
commit9656153b87d47b34986f2d77eef9199c24cbf9f6 (patch)
tree775cea8cee6dafafd27ab89da6c28e95da051c3a
parentcompletion: also complete git-log's --left-right and --cherry-pick option (diff)
parentgitk: Fix bug causing undefined variable error when cherry-picking (diff)
downloadtgif-9656153b87d47b34986f2d77eef9199c24cbf9f6.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug causing undefined variable error when cherry-picking
-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) {}