aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-20 22:10:52 +1000
committerPaul Mackerras <paulus@samba.org>2007-10-20 22:10:52 +1000
commit3ebba3c724f77d149061c62f4414166649c2e56e (patch)
tree702f92acf4559210eb6b2b1cbd9102d8e8da3a44
parent5d7589d4c43e941563dfa2d096e6d6c184191702 (diff)
downloadgit-3ebba3c724f77d149061c62f4414166649c2e56e.tar.gz
git-3ebba3c724f77d149061c62f4414166649c2e56e.tar.xz
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>
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index 06172a434..f910cba8b 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) {}