From d5257fb3c1decc1eff296a0ae2afbcaee28d0f2c Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Sat, 7 Aug 2010 20:32:13 +0100 Subject: git-gui: handle textconv filter on Windows and in development When developing/testing we run git-gui.sh directly and the makefile configured variables are not properly set. Configure the new shellpath accessor to handle this case. On Windows we may not find the shell so in this case revert to simply executing the filter command without the shell intermediate. Signed-off-by: Pat Thoyts --- lib/blame.tcl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/blame.tcl b/lib/blame.tcl index 77656d3675..61e358f960 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -461,8 +461,13 @@ method _load {jump} { if {$commit eq {}} { if {$do_textconv ne 0} { # Run textconv with sh -c "..." to allow it to - # contain command + arguments. - set fd [open |[list [shellpath] -c "$textconv \"\$0\"" $path] r] + # contain command + arguments. On windows, just + # call the filter command. + if {![file executable [shellpath]]} { + set fd [open |[linsert $textconv end $path] r] + } else { + set fd [open |[list [shellpath] -c "$textconv \"\$0\"" $path] r] + } } else { set fd [open $path r] } -- cgit v1.3