Git development
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: git@vger.kernel.org
Subject: quick patch for gitk-1.1
Date: Sun, 19 Jun 2005 22:01:57 +1000	[thread overview]
Message-ID: <17077.24245.159322.636067@cargo.ozlabs.ibm.com> (raw)

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)]} {

                 reply	other threads:[~2005-06-19 11:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=17077.24245.159322.636067@cargo.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox