summaryrefslogtreecommitdiff
path: root/git-gui/lib/blame.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-15 19:34:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-15 19:34:48 (GMT)
commit12644fa99fd16c33379c885670be0963cec07fc1 (patch)
treedcc24e83797accfe0f781011af4c318f7c855743 /git-gui/lib/blame.tcl
parent5879b6bbcaba7696e4abfa717748da166f915405 (diff)
parent00e9de72c8f9b7c048bb56a59be9567d69dc1e01 (diff)
downloadgit-12644fa99fd16c33379c885670be0963cec07fc1.zip
git-12644fa99fd16c33379c885670be0963cec07fc1.tar.gz
git-12644fa99fd16c33379c885670be0963cec07fc1.tar.bz2
Merge git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui 0.13 git-gui: avoid mis-encoding the copyright message on Windows. git-gui: Update Swedish translation (521t). git-gui: ensure correct application termination in git-gui--askpass git-gui: handle textconv filter on Windows and in development git-gui: use shell to launch textconv filter in "blame" git-gui: display error launching blame as a message box. git-gui: Make usage statement visible on Windows.
Diffstat (limited to 'git-gui/lib/blame.tcl')
-rw-r--r--git-gui/lib/blame.tcl9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index 2137ec9..61e358f 100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -460,7 +460,14 @@ method _load {jump} {
}
if {$commit eq {}} {
if {$do_textconv ne 0} {
- set fd [open |[list $textconv $path] r]
+ # Run textconv with sh -c "..." to allow it to
+ # 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]
}