From: Paul Mackerras <paulus@samba.org>
Date: Sat, 20 Oct 2007 12:10:52 +0000 (+1000)
Subject: gitk: Avoid an error when cherry-picking if HEAD has moved on
X-Git-Tag: v1.5.4-rc0~333^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ebba3c724f77d149061c62f4414166649c2e56e?hp=--cc

gitk: Avoid an error when cherry-picking if HEAD has moved on

This fixes an error reported by Adam Piątyszek: if the current HEAD
is not in the graph that gitk knows about when we do a cherry-pick
using gitk, then gitk hits an error when trying to update its
internal representation of the topology.  This avoids the error by
not doing that update if the HEAD before the cherry-pick was a
commit that gitk doesn't know about.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

3ebba3c724f77d149061c62f4414166649c2e56e
diff --git a/gitk b/gitk
index 06172a434b..f910cba8bf 100755
--- a/gitk
+++ b/gitk
@@ -6648,7 +6648,7 @@ proc addnewchild {id p} {
     global arcnos arcids arctags arcout arcend arcstart archeads growing
     global seeds allcommits
 
-    if {![info exists allcommits]} return
+    if {![info exists allcommits] || ![info exists arcnos($p)]} return
     lappend allids $id
     set allparents($id) [list $p]
     set allchildren($id) {}