undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

textconv: use shell to run helper

Browse Source 
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>
This commit is contained in:
Jeff King 2009-12-30 06:01:09 -05:00 committed by Junio C Hamano
parent bac8037081
commit 41a457e4f8
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@ -3771,6 +3771,7 @@ static char *run_textconv(const char *pgm, struct diff_filespec *spec,
*arg = NULL; *arg = NULL;
memset(&child, 0, sizeof(child)); memset(&child, 0, sizeof(child));
child.use_shell = 1;
child.argv = argv; child.argv = argv;
child.out = -1; child.out = -1;
if (start_command(&child) != 0 || if (start_command(&child) != 0 ||

2
t/t4030-diff-textconv.sh
View File

@ -48,7 +48,7 @@ test_expect_success 'file is considered binary by plumbing' '
test_expect_success 'setup textconv filters' ' test_expect_success 'setup textconv filters' '
echo file diff=foo >.gitattributes && 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
' '

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

@ -54,7 +54,7 @@ chmod +x dump
test_expect_success 'setup textconv' ' test_expect_success 'setup textconv' '
echo file diff=foo >.gitattributes && 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' '