summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2010-08-05 12:05:22 +0200
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2010-08-12 21:35:09 +0100
commit62f9a632c819bd53a5b7dbe40409ab086a4bce10 (patch)
tree6fd7855db671a1f80ff8e9043198ad8604b1de43 /Makefile
parentgit-gui: display error launching blame as a message box. (diff)
downloadtgif-62f9a632c819bd53a5b7dbe40409ab086a4bce10.tar.xz
git-gui: use shell to launch textconv filter in "blame"
The textconv filters may include multiple arguments and may make use of unix shell features. To maintain compatibility with 'git blame' ensure these commands are passed through bash. Reported-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 197b55edf3..e22ba5c321 100644
--- a/Makefile
+++ b/Makefile
@@ -215,6 +215,7 @@ endif
$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
$(QUIET_GEN)rm -f $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@SHELL_PATH@@|$(SHELL_PATH_SQ)|' \
-e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
-e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \
-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \