From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Jun 2005 14:58:36 GMT
Subject: Re: gitk-1.1 out
Message-ID: <Pine.LNX.4.58.0506090728280.2286@ppc970.osdl.org>
In-Reply-To: <17064.15104.847009.390149@cargo.ozlabs.ibm.com>



On Thu, 9 Jun 2005, Paul Mackerras wrote:
> 
> Try this patch against gitk-1.1 and let me know what you think.  I
> draw the heads as a green rectangle with a black border.

Works for me. My cvs-import testing "syslinux" tree now has the heads of
the different branches nicely named.

However, I also changed it to allow the "direct" kinds of tags which the 
cvs2git thing creates, where the tag file contains just a direct pointer 
to the commit, rather than a pointer to a tag object.

I'm not a TCL weenie, so this is just a very quick hack, and you may want 
to re-do things properly, but something like the appended works for me..

> I also added a -t option to gitk which makes it use gitk-rev-tree
> instead of git-rev-list, so that you can do
> 
> 	gitk -t $(ls .git/refs/heads)

No need, I think yoy may have an old version of git.

		Linus

--- hacky hack hack ---
--- gitk	2005-06-09 07:26:50.000000000 -0700
+++ gitk	2005-06-09 07:55:00.000000000 -0700
@@ -151,6 +151,11 @@
 	    set fd [open $f r]
 	    set line [read $fd]
 	    if {[regexp {^[0-9a-f]{40}} $line id]} {
+		if {[regexp {[^/]*$} $f direct]} {
+		    set tagids($direct) $id
+		    lappend idtags($id) $direct
+		}
+
 		set contents [split [exec git-cat-file tag $id] "\n"]
 		set obj {}
 		set type {}