summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <casey@nrlssc.navy.mil>2007-03-19 18:00:37 -0500
committerLibravatar Paul Mackerras <paulus@samba.org>2007-03-21 22:02:19 +1100
commit1ce09dd6787c495986c75b37b07ba6bbf19b47da (patch)
tree9f51aec0db49caeb8eb2575d73bf5997fe466eab
parent[PATCH] gitk: bind <F5> key to Update (reread commits) (diff)
downloadtgif-1ce09dd6787c495986c75b37b07ba6bbf19b47da.tar.xz
[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>
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk b/gitk
index 1cd2a8f528..db28d745dc 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
}