--- a/contrib/hgk	Mon Jun 04 16:54:52 2007 +1000
+++ b/contrib/hgk	Mon Jun 04 09:16:53 2007 -0500
@@ -264,9 +264,8 @@
     regsub -all "\r\n" $tags "\n" tags
     set lines [split $tags "\n"]
     foreach f $lines {
-	set f [regexp -all -inline {\S+} $f]
-	set direct [lindex $f 0]
-	set full [lindex $f 1]
+	regexp {(\S+)$} $f full
+	regsub {\s+(\S+)$} $f "" direct
 	set sha [split $full ':']
 	set tag [lindex $sha 1]
 	lappend tagids($direct) $tag