Git development
 help / color / mirror / Atom feed
* quick patch for gitk-1.1
@ 2005-06-19 12:01 Paul Mackerras
  0 siblings, 0 replies; only message in thread
From: Paul Mackerras @ 2005-06-19 12:01 UTC (permalink / raw)
  To: git

It turns out that Linus' linux-2.6 tree now has a commit in it with
one of the parents listed twice, which confuses gitk and causes it to
stop with an error.  I have a new version of gitk almost ready to go,
but in the meantime here is a quick patch for gitk-1.1 to fix the
problem.

The confusing commit is 13e652800d1644dfedcd0d59ac95ef0beb7f3165.

Paul.

--- gitk~	2005-06-01 18:14:51.000000000 +1000
+++ gitk	2005-06-19 21:55:02.000000000 +1000
@@ -582,6 +582,7 @@
 	set ofill white
 	if {[info exists parents($id)]} {
 	    foreach p $parents($id) {
+		if {[lsearch -exact $actualparents $p] >= 0} continue
 		if {[info exists ncleft($p)]} {
 		    incr ncleft($p) -1
 		    if {![info exists commitinfo($p)]} {

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-06-19 11:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-19 12:01 quick patch for gitk-1.1 Paul Mackerras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox