Merge git://git2.kernel.org/pub/scm/gitk/gitk

* git://git2.kernel.org/pub/scm/gitk/gitk:
  [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk
This commit is contained in:
Junio C Hamano 2007-03-22 03:05:34 -07:00
commit 00cec846f1

4
gitk
View File

@ -1906,7 +1906,7 @@ proc do_file_hl {serial} {
} else { } else {
set gdtargs [list "-S$highlight_files"] 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+] set filehighlight [open $cmd r+]
fconfigure $filehighlight -blocking 0 fconfigure $filehighlight -blocking 0
fileevent $filehighlight readable readfhighlight fileevent $filehighlight readable readfhighlight
@ -1958,7 +1958,7 @@ proc readfhighlight {} {
} }
if {[eof $filehighlight]} { if {[eof $filehighlight]} {
# strange... # strange...
puts "oops, git-diff-tree died" puts "oops, git diff-tree died"
catch {close $filehighlight} catch {close $filehighlight}
unset filehighlight unset filehighlight
} }