diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:34:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:34:48 -0700 |
| commit | 12644fa99fd16c33379c885670be0963cec07fc1 (patch) | |
| tree | dcc24e83797accfe0f781011af4c318f7c855743 /git-gui/lib | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-gui 0.13 (diff) | |
| download | tgif-12644fa99fd16c33379c885670be0963cec07fc1.tar.xz | |
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')
| -rw-r--r-- | git-gui/lib/blame.tcl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl index 2137ec9684..61e358f960 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] } |