textconv: use shell to run helper

Currently textconv helpers are run directly. Running through
the shell is useful because the user can provide a program
with command line arguments, like "antiword -f".

It also makes textconv more consistent with other parts of
git, most of which run their helpers using the shell.

The downside is that textconv helpers with shell
metacharacters (like space) in the filename will be broken.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 08bbd3e9070996b38f4d34cedf7640d93aa5808d..4af7c3f9257a32ce694ff3dc902fe0aa71d4820b 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3771,6 +3771,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
        *arg = NULL;
 
        memset(&child, 0, sizeof(child));
        *arg = NULL;
 
        memset(&child, 0, sizeof(child));

+       child.use_shell = 1;

        child.argv = argv;
        child.out = -1;
        if (start_command(&child) != 0 ||
        child.argv = argv;
        child.out = -1;
        if (start_command(&child) != 0 ||

diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index a3f0897a52ce2147388baeac6fc64d3b8501b516..c16d538f4694e86c4a1159ea121afe2b35f47ad2 100755 (executable)
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -48,7 +48,7 @@ test_expect_success 'file is considered binary by plumbing' '
 
 test_expect_success 'setup textconv filters' '
        echo file diff=foo >.gitattributes &&
 
 test_expect_success 'setup textconv filters' '
        echo file diff=foo >.gitattributes &&

-       git config diff.foo.textconv "$PWD"/hexdump &&
+       git config diff.foo.textconv "\"$PWD\""/hexdump &&

        git config diff.fail.textconv false
 '
 
        git config diff.fail.textconv false
 '
 

diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index a894c6062271c53b688830a3230d1c78fb561d70..27fb31b401b16e967cdf7a3eac91e3ac03150ba8 100755 (executable)
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -54,7 +54,7 @@ chmod +x dump
 
 test_expect_success 'setup textconv' '
        echo file diff=foo >.gitattributes &&
 
 test_expect_success 'setup textconv' '
        echo file diff=foo >.gitattributes &&

-       git config diff.foo.textconv "$PWD"/dump
+       git config diff.foo.textconv "\"$PWD\""/dump

 '
 
 test_expect_success 'rewrite diff respects textconv' '
 '
 
 test_expect_success 'rewrite diff respects textconv' '