diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-12 16:49:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-25 04:56:13 (GMT) |
| commit | 7096b6486e40f509ee53448596b3cdb86360ad3e (patch) | |
| tree | 3ffaaa525f00e14379e949f97f73e7ce6a75aa1f /t/t4200-rerere.sh | |
| parent | 770bf6c5e2830add4b59d3dbf9929e62ed4d6fb7 (diff) | |
| download | git-7096b6486e40f509ee53448596b3cdb86360ad3e.zip git-7096b6486e40f509ee53448596b3cdb86360ad3e.tar.gz git-7096b6486e40f509ee53448596b3cdb86360ad3e.tar.bz2 | |
tests: enclose $PERL_PATH in double quotes
Otherwise it will be split at a space after "Program" when it is set
to "\\Program Files\perl" or something silly like that.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index ec7622c..3ab670d 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -78,7 +78,7 @@ test_expect_success 'activate rerere, old style (conflicting merge)' ' test_might_fail git config --unset rerere.enabled && test_must_fail git merge first && - sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && + sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 && grep "^=======\$" $rr/preimage && ! test -f $rr/postimage && @@ -91,7 +91,7 @@ test_expect_success 'rerere.enabled works, too' ' git reset --hard && test_must_fail git merge first && - sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && + sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 && grep ^=======$ $rr/preimage ' @@ -101,7 +101,7 @@ test_expect_success 'set up rr-cache' ' git config rerere.enabled true && git reset --hard && test_must_fail git merge first && - sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && + sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 ' @@ -185,7 +185,7 @@ test_expect_success 'rerere updates postimage timestamp' ' test_expect_success 'rerere clear' ' rm $rr/postimage && - echo "$sha1 a1" | $PERL_PATH -pe "y/\012/\000/" >.git/MERGE_RR && + echo "$sha1 a1" | "$PERL_PATH" -pe "y/\012/\000/" >.git/MERGE_RR && git rerere clear && ! test -d $rr ' |