git/list[1] front-page[2] threads[3] people[4] search[5] about
 

quick patch for gitk-1.1

From
Paul Mackerras <paulus@samba.org>
Date
Jun 19, 2005, 12:01 UTC
Message-ID
<17077.24245.159322.636067@cargo.ozlabs.ibm.com>

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)]} {
Message 1 of 1 in “quick patch for gitk-1.1”
  1. Paul MackerrasJun 19, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.