From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Mon, 19 Mar 2007 23:00:37 +0000 (-0500)
Subject: [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk
X-Git-Tag: v1.5.1-rc2~29^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ce09dd6787c495986c75b37b07ba6bbf19b47da;p=git.git

[PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk

Preferring git _space_ COMMAND over git _dash_ COMMAND allows the
user to have only git and gitk in their path. e.g. when git and gitk
are symbolic links in a personal bin directory to the real git and gitk.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 1cd2a8f52..db28d745d 100755
--- a/gitk
+++ b/gitk
@@ -1906,7 +1906,7 @@ proc do_file_hl {serial} {
     } else {
 	set gdtargs [list "-S$highlight_files"]
     }
-    set cmd [concat | git-diff-tree -r -s --stdin $gdtargs]
+    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
     set filehighlight [open $cmd r+]
     fconfigure $filehighlight -blocking 0
     fileevent $filehighlight readable readfhighlight
@@ -1958,7 +1958,7 @@ proc readfhighlight {} {
     }
     if {[eof $filehighlight]} {
 	# strange...
-	puts "oops, git-diff-tree died"
+	puts "oops, git diff-tree died"
 	catch {close $filehighlight}
 	unset filehighlight
     }