diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:15 -0800 |
| commit | 4fa088209c81845e73756a4173a8c954e25958d2 (patch) | |
| tree | 7590d45bb9b42df97f3bd2e8e833aa4561cf1028 /t | |
| parent | fa232d457ebc1620ab31be504068c38403497179 (diff) | |
| parent | 6396258368b76d432090c81096755dc1fbc89551 (diff) | |
| download | git-4fa088209c81845e73756a4173a8c954e25958d2.tar.gz git-4fa088209c81845e73756a4173a8c954e25958d2.tar.xz | |
Merge branch 'jk/run-command-use-shell'
* jk/run-command-use-shell:
t4030, t4031: work around bogus MSYS bash path conversion
diff: run external diff helper with shell
textconv: use shell to run helper
editor: use run_command's shell feature
run-command: optimize out useless shell calls
run-command: convert simple callsites to use_shell
t0021: use $SHELL_PATH for the filter script
run-command: add "use shell" option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0021-conversion.sh | 3 | ||||
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 2 | ||||
| -rwxr-xr-x | t/t4031-diff-rewrite-binary.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 8fc39d77c..6cb8d60ea 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -4,7 +4,8 @@ test_description='blob conversion via gitattributes' . ./test-lib.sh -cat <<\EOF >rot13.sh +cat <<EOF >rot13.sh +#!$SHELL_PATH tr \ 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \ 'nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM' diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index a3f0897a5..88c5619ae 100755 --- 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 && - git config diff.foo.textconv "$PWD"/hexdump && + git config diff.foo.textconv "\"$(pwd)\""/hexdump && git config diff.fail.textconv false ' diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh index a894c6062..7e7b307a2 100755 --- 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 && - git config diff.foo.textconv "$PWD"/dump + git config diff.foo.textconv "\"$(pwd)\""/dump ' test_expect_success 'rewrite diff respects textconv' ' |