Browse Source

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>
maint
Jeff King 15 years ago committed by Junio C Hamano
parent
commit
41a457e4f8
  1. 1
      diff.c
  2. 2
      t/t4030-diff-textconv.sh
  3. 2
      t/t4031-diff-rewrite-binary.sh

1
diff.c

@ -3771,6 +3771,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec, @@ -3771,6 +3771,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
*arg = NULL;

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

2
t/t4030-diff-textconv.sh

@ -48,7 +48,7 @@ test_expect_success 'file is considered binary by plumbing' ' @@ -48,7 +48,7 @@ test_expect_success 'file is considered binary by plumbing' '

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
'


2
t/t4031-diff-rewrite-binary.sh

@ -54,7 +54,7 @@ chmod +x dump @@ -54,7 +54,7 @@ chmod +x dump

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' '

Loading…
Cancel
Save