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>

diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index 3535761154bde43bc54dc62acf5c74fe5279dd5d..df573c4978c9d6b665b56eeae7bc9997c7df4207 100755 (executable)
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -42,13 +42,13 @@ test_expect_success 'ls-tree piped to mktree (2)' '
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (1)' '
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (1)' '

-       $PERL_PATH -e "print reverse <>" <top |
+       "$PERL_PATH" -e "print reverse <>" <top |

        git mktree >actual &&
        test_cmp tree actual
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (2)' '
        git mktree >actual &&
        test_cmp tree actual
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (2)' '

-       $PERL_PATH -e "print reverse <>" <top.withsub |
+       "$PERL_PATH" -e "print reverse <>" <top.withsub |

        git mktree >actual &&
        test_cmp tree.withsub actual
 '
        git mktree >actual &&
        test_cmp tree.withsub actual
 '

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index f42adc4ad5be62ee663dc957febc51b2e7b1eab5..1f35e55ee3be1b2bbdb8aa9f3248f6fe5ebf46cb 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -71,7 +71,7 @@ test_expect_success 'ls-files -z does not quote funny filename' '
        tabs    ," (dq) and spaces
        EOF
        git ls-files -z >ls-files.z &&
        tabs    ," (dq) and spaces
        EOF
        git ls-files -z >ls-files.z &&

-       $PERL_PATH -pe "y/\000/\012/" <ls-files.z >current &&
+       "$PERL_PATH" -pe "y/\000/\012/" <ls-files.z >current &&

        test_cmp expected current
 '
 
        test_cmp expected current
 '
 


@@ -108,7 +108,7 @@ test_expect_success 'diff-index -z does not quote funny filename' '
        tabs    ," (dq) and spaces
        EOF
        git diff-index -z --name-status $t0 >diff-index.z &&
        tabs    ," (dq) and spaces
        EOF
        git diff-index -z --name-status $t0 >diff-index.z &&

-       $PERL_PATH -pe "y/\000/\012/" <diff-index.z >current &&
+       "$PERL_PATH" -pe "y/\000/\012/" <diff-index.z >current &&

        test_cmp expected current
 '
 
        test_cmp expected current
 '
 


@@ -118,7 +118,7 @@ test_expect_success 'diff-tree -z does not quote funny filename' '
        tabs    ," (dq) and spaces
        EOF
        git diff-tree -z --name-status $t0 $t1 >diff-tree.z &&
        tabs    ," (dq) and spaces
        EOF
        git diff-tree -z --name-status $t0 $t1 >diff-tree.z &&

-       $PERL_PATH -pe y/\\000/\\012/ <diff-tree.z >current &&
+       "$PERL_PATH" -pe y/\\000/\\012/ <diff-tree.z >current &&

        test_cmp expected current
 '
 
        test_cmp expected current
 '
 

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 4c22c17a3346161e933cbd1e8b4303cc20fde095..959aa26ef5d96f4be79e6051fb6ae159e03b556e 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -243,7 +243,7 @@ check_threading () {
        (git format-patch --stdout "$@"; echo $? > status.out) |
        # Prints everything between the Message-ID and In-Reply-To,
        # and replaces all Message-ID-lookalikes by a sequence number
        (git format-patch --stdout "$@"; echo $? > status.out) |
        # Prints everything between the Message-ID and In-Reply-To,
        # and replaces all Message-ID-lookalikes by a sequence number

-       $PERL_PATH -ne '
+       "$PERL_PATH" -ne '

                if (/^(message-id|references|in-reply-to)/i) {
                        $printing = 1;
                } elsif (/^\S/) {
                if (/^(message-id|references|in-reply-to)/i) {
                        $printing = 1;
                } elsif (/^\S/) {

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 3d9307b25e30aaa27ae20c52153a2eeb70fcede5..533afc1185114e8ea7e7e5e9315ceaf7816e32c2 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -118,7 +118,7 @@ test_expect_success 'no diff with -diff' '
        git diff | grep Binary
 '
 
        git diff | grep Binary
 '
 

-echo NULZbetweenZwords | $PERL_PATH -pe 'y/Z/\000/' > file
+echo NULZbetweenZwords | "$PERL_PATH" -pe 'y/Z/\000/' > file

 
 test_expect_success 'force diff with "diff"' '
        echo >.gitattributes "file diff" &&
 
 test_expect_success 'force diff with "diff"' '
        echo >.gitattributes "file diff" &&

diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 7f7f504ab90da5732c8a7f41f69c5538865bd89e..36e2f075c9f94286a05474b58e7600f2a9de2f20 100755 (executable)
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -27,7 +27,7 @@ test_expect_success \
      git config --bool diff.suppressBlankEmpty true &&
      git diff f > actual &&
      test_cmp exp actual &&
      git config --bool diff.suppressBlankEmpty true &&
      git diff f > actual &&
      test_cmp exp actual &&

-     $PERL_PATH -i.bak -p -e "s/^\$/ /" exp &&
+     "$PERL_PATH" -i.bak -p -e "s/^\$/ /" exp &&

      git config --bool diff.suppressBlankEmpty false &&
      git diff f > actual &&
      test_cmp exp actual &&
      git config --bool diff.suppressBlankEmpty false &&
      git diff f > actual &&
      test_cmp exp actual &&

diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 82e36ec9426954d99d9c3115aa14c5eb15a12d2b..eebb1eed8b1e084ddc048dc20797dfcd2f37e3ea 100755 (executable)
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -21,7 +21,7 @@ EOF
 
 cat >hexdump <<'EOF'
 #!/bin/sh
 
 cat >hexdump <<'EOF'
 #!/bin/sh

-$PERL_PATH -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
+"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"

 EOF
 chmod +x hexdump
 
 EOF
 chmod +x hexdump
 

diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index e8ee06e29cf2592e12aeb8043a671e28e335399b..eacc6694f785acb2e6287dd4c5bce9a5e834a361 100755 (executable)
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -60,7 +60,7 @@ test_expect_success 'diff --stat counts binary rewrite as 0 lines' '
 {
        echo "#!$SHELL_PATH"
        cat <<'EOF'
 {
        echo "#!$SHELL_PATH"
        cat <<'EOF'

-$PERL_PATH -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
+"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"

 EOF
 } >dump
 chmod +x dump
 EOF
 } >dump
 chmod +x dump

diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 5b533cf939d4bf2a1c89c8262b44d6558aafda0c..99627bc6d69f17a8dce0ad318764e32cd9d9f507 100755 (executable)
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -25,10 +25,10 @@ test_expect_success 'setup' "
        git commit -m 'Initial Version' 2>/dev/null &&
 
        git checkout -b binary &&
        git commit -m 'Initial Version' 2>/dev/null &&
 
        git checkout -b binary &&

-       $PERL_PATH -pe 'y/x/\000/' <file1 >file3 &&
+       "$PERL_PATH" -pe 'y/x/\000/' <file1 >file3 &&

        cat file3 >file4 &&
        git add file2 &&
        cat file3 >file4 &&
        git add file2 &&

-       $PERL_PATH -pe 'y/\000/v/' <file3 >file1 &&
+       "$PERL_PATH" -pe 'y/\000/v/' <file3 >file1 &&

        rm -f file2 &&
        git update-index --add --remove file1 file2 file3 file4 &&
        git commit -m 'Second Version' &&
        rm -f file2 &&
        git update-index --add --remove file1 file2 file3 file4 &&
        git commit -m 'Second Version' &&

diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index 7b0c02abad8e5f94d6e3708cc0dce974b96f40fa..fca815392e305da095486888a38b6bff41e3d750 100755 (executable)
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -12,14 +12,14 @@ test_description='git apply in reverse
 test_expect_success setup '
 
        for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
 test_expect_success setup '
 
        for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&

-       $PERL_PATH -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
+       "$PERL_PATH" -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&

 
        git add file1 file2 &&
        git commit -m initial &&
        git tag initial &&
 
        for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
 
        git add file1 file2 &&
        git commit -m initial &&
        git tag initial &&
 
        for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&

-       $PERL_PATH -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
+       "$PERL_PATH" -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&

 
        git commit -a -m second &&
        git tag second &&
 
        git commit -a -m second &&
        git tag second &&

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index ec7622cbeff251acb68600dc746eb7c5912bb324..3ab670d36aea890e07827b14486e4c49de83bdb5 100755 (executable)
--- 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 &&
 
        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 &&
        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 &&
 
        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
 '
        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 &&
        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
 '
 
        rr=.git/rr-cache/$sha1
 '
 


@@ -185,7 +185,7 @@ test_expect_success 'rerere updates postimage timestamp' '
 
 test_expect_success 'rerere clear' '
        rm $rr/postimage &&
 
 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
 '
        git rerere clear &&
        ! test -d $rr
 '

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a97bb74811c8d10b1da83918a8c7c5ac62cdeb42..4fd69a19ebab07cc0ca784b63a7f02ddd613f306 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -13,9 +13,9 @@ TRASH=`pwd`
 test_expect_success \
     'setup' \
     'rm -f .git/index* &&
 test_expect_success \
     'setup' \
     'rm -f .git/index* &&

-     $PERL_PATH -e "print \"a\" x 4096;" > a &&
-     $PERL_PATH -e "print \"b\" x 4096;" > b &&
-     $PERL_PATH -e "print \"c\" x 4096;" > c &&
+     "$PERL_PATH" -e "print \"a\" x 4096;" > a &&
+     "$PERL_PATH" -e "print \"b\" x 4096;" > b &&
+     "$PERL_PATH" -e "print \"c\" x 4096;" > c &&

      test-genrandom "seed a" 2097152 > a_big &&
      test-genrandom "seed b" 2097152 > b_big &&
      git update-index --add a a_big b b_big c &&
      test-genrandom "seed a" 2097152 > a_big &&
      test-genrandom "seed b" 2097152 > b_big &&
      git update-index --add a a_big b b_big c &&


@@ -129,7 +129,7 @@ test_expect_success \
 cd "$TRASH"
 
 test_expect_success 'compare delta flavors' '
 cd "$TRASH"
 
 test_expect_success 'compare delta flavors' '

-       $PERL_PATH -e '\''
+       "$PERL_PATH" -e '\''

                defined($_ = -s $_) or die for @ARGV;
                exit 1 if $ARGV[0] <= $ARGV[1];
        '\'' test-2-$packname_2.pack test-3-$packname_3.pack
                defined($_ = -s $_) or die for @ARGV;
                exit 1 if $ARGV[0] <= $ARGV[1];
        '\'' test-2-$packname_2.pack test-3-$packname_3.pack

diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh
index ee4e1af6845d2fcb7bccb6af98fc05d86aa44ea1..5b1250f0d2d69369fccacbefa3fa24488e9c4b4e 100755 (executable)
--- a/t/t5303-pack-corruption-resilience.sh
+++ b/t/t5303-pack-corruption-resilience.sh
@@ -98,7 +98,7 @@ test_expect_success \
     'create_new_pack &&
      git prune-packed &&
      chmod +w ${pack}.pack &&
     'create_new_pack &&
      git prune-packed &&
      chmod +w ${pack}.pack &&

-     $PERL_PATH -i.bak -pe "s/ base /abcdef/" ${pack}.pack &&
+     "$PERL_PATH" -i.bak -pe "s/ base /abcdef/" ${pack}.pack &&

      test_must_fail git cat-file blob $blob_1 > /dev/null &&
      test_must_fail git cat-file blob $blob_2 > /dev/null &&
      test_must_fail git cat-file blob $blob_3 > /dev/null'
      test_must_fail git cat-file blob $blob_1 > /dev/null &&
      test_must_fail git cat-file blob $blob_2 > /dev/null &&
      test_must_fail git cat-file blob $blob_3 > /dev/null'


@@ -155,7 +155,7 @@ test_expect_success \
     'create_new_pack &&
      git prune-packed &&
      chmod +w ${pack}.pack &&
     'create_new_pack &&
      git prune-packed &&
      chmod +w ${pack}.pack &&

-     $PERL_PATH -i.bak -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&
+     "$PERL_PATH" -i.bak -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&

      git cat-file blob $blob_1 > /dev/null &&
      test_must_fail git cat-file blob $blob_2 > /dev/null &&
      test_must_fail git cat-file blob $blob_3 > /dev/null'
      git cat-file blob $blob_1 > /dev/null &&
      test_must_fail git cat-file blob $blob_2 > /dev/null &&
      test_must_fail git cat-file blob $blob_3 > /dev/null'

diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index 6ef43782663b07fe9594851d67ca1e314beacd24..5531bd1af42dac808d64d75a6fc3e848ef968a34 100755 (executable)
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup remote repo' '
 cat >proxy <<'EOF'
 #!/bin/sh
 echo >&2 "proxying for $*"
 cat >proxy <<'EOF'
 #!/bin/sh
 echo >&2 "proxying for $*"

-cmd=`$PERL_PATH -e '
+cmd=`"$PERL_PATH" -e '

        read(STDIN, $buf, 4);
        my $n = hex($buf) - 4;
        read(STDIN, $buf, $n);
        read(STDIN, $buf, 4);
        my $n = hex($buf) - 4;
        read(STDIN, $buf, $n);

diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh
index 0667a3b750239fce88b4e61fbc40d1e126b5f6ab..fadf2f258ea5305fb52d418a6409fb07889bc205 100755 (executable)
--- a/t/t5551-http-fetch.sh
+++ b/t/t5551-http-fetch.sh
@@ -130,7 +130,7 @@ test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '
        done | git fast-import --export-marks=marks &&
 
        # now assign tags to all the dangling commits we created above
        done | git fast-import --export-marks=marks &&
 
        # now assign tags to all the dangling commits we created above

-       tag=$($PERL_PATH -e "print \"bla\" x 30") &&
+       tag=$("$PERL_PATH" -e "print \"bla\" x 30") &&

        sed -e "s/^:\(.\+\) \(.\+\)$/\2 refs\/tags\/$tag-\1/" <marks >>packed-refs
        )
 '
        sed -e "s/^:\(.\+\) \(.\+\)$/\2 refs\/tags\/$tag-\1/" <marks >>packed-refs
        )
 '

diff --git a/t/t6011-rev-list-with-bad-commit.sh b/t/t6011-rev-list-with-bad-commit.sh
index b2c6125bcf149ad9d9f6fc6b34a85c6c8250a553..bbb0581f88a874c74e296754544300544429ccc4 100755 (executable)
--- a/t/t6011-rev-list-with-bad-commit.sh
+++ b/t/t6011-rev-list-with-bad-commit.sh
@@ -37,7 +37,7 @@ test_expect_success 'verify number of revisions' \
 
 test_expect_success 'corrupt second commit object' \
    '
 
 test_expect_success 'corrupt second commit object' \
    '

-   $PERL_PATH -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
+   "$PERL_PATH" -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&

    test_must_fail git fsck --full
    '
 
    test_must_fail git fsck --full
    '
 

diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 3178c14d20d79c175f9ac7b49614fb840b0a4d7b..892a537989fd7e877f698925fb0a8a33a1e20939 100755 (executable)
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -25,7 +25,7 @@ test_expect_success 'set up --reverse example' '
 
 test_expect_success '--reverse --parents --full-history combines correctly' '
        git rev-list --parents --full-history master -- foo |
 
 test_expect_success '--reverse --parents --full-history combines correctly' '
        git rev-list --parents --full-history master -- foo |

-               $PERL_PATH -e "print reverse <>" > expected &&
+               "$PERL_PATH" -e "print reverse <>" > expected &&

        git rev-list --reverse --parents --full-history master -- foo \
                > actual &&
        test_cmp actual expected
        git rev-list --reverse --parents --full-history master -- foo \
                > actual &&
        test_cmp actual expected


@@ -33,7 +33,7 @@ test_expect_success '--reverse --parents --full-history combines correctly' '
 
 test_expect_success '--boundary does too' '
        git rev-list --boundary --parents --full-history master ^root -- foo |
 
 test_expect_success '--boundary does too' '
        git rev-list --boundary --parents --full-history master ^root -- foo |

-               $PERL_PATH -e "print reverse <>" > expected &&
+               "$PERL_PATH" -e "print reverse <>" > expected &&

        git rev-list --boundary --reverse --parents --full-history \
                master ^root -- foo > actual &&
        test_cmp actual expected
        git rev-list --boundary --reverse --parents --full-history \
                master ^root -- foo > actual &&
        test_cmp actual expected

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 5e9160f807c3325466624e0e43bd2788b0d4c69b..c206f4777a36a28687def873bd9fe60ed322fbbc 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -941,7 +941,7 @@ test_expect_success 'status -s submodule summary (clean submodule)' '
 
 test_expect_success 'status -z implies porcelain' '
        git status --porcelain |
 
 test_expect_success 'status -z implies porcelain' '
        git status --porcelain |

-       $PERL_PATH -pe "s/\012/\000/g" >expect &&
+       "$PERL_PATH" -pe "s/\012/\000/g" >expect &&

        git status -z >output &&
        test_cmp expect output
 '
        git status -z >output &&
        test_cmp expect output
 '

diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index 06b8f8609305d31dd5235a41ea1cfd9ac743d756..bf6caa4dc3d42230757526dd215ab777f77ae369 100755 (executable)
--- a/t/t8006-blame-textconv.sh
+++ b/t/t8006-blame-textconv.sh
@@ -10,7 +10,7 @@ find_blame() {
 cat >helper <<'EOF'
 #!/bin/sh
 grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
 cat >helper <<'EOF'
 #!/bin/sh
 grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }

-$PERL_PATH -p -e 's/^bin: /converted: /' "$1"
+"$PERL_PATH" -p -e 's/^bin: /converted: /' "$1"

 EOF
 chmod +x helper
 
 EOF
 chmod +x helper
 

diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index c9c8d029533569caa0c88c2c08ed670083d8f6a6..9a40f1e1993a1bc04e3e1cba6452dd290a8e00e9 100755 (executable)
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -29,7 +29,7 @@ fi
 compare_svn_head_with () {
        # extract just the log message and strip out committer info.
        # don't use --limit here since svn 1.1.x doesn't have it,
 compare_svn_head_with () {
        # extract just the log message and strip out committer info.
        # don't use --limit here since svn 1.1.x doesn't have it,

-       LC_ALL="$a_utf8_locale" svn log `git svn info --url` | $PERL_PATH -w -e '
+       LC_ALL="$a_utf8_locale" svn log `git svn info --url` | "$PERL_PATH" -w -e '

                use bytes;
                $/ = ("-"x72) . "\n";
                my @x = <STDIN>;
                use bytes;
                $/ = ("-"x72) . "\n";
                my @x = <STDIN>;

diff --git a/t/t9137-git-svn-dcommit-clobber-series.sh b/t/t9137-git-svn-dcommit-clobber-series.sh
index 726875af73365cd7ea64ddc63fcf3fc70cdb9cd3..c17aa3186f7dbf02f474345ba507969060f867ab 100755 (executable)
--- a/t/t9137-git-svn-dcommit-clobber-series.sh
+++ b/t/t9137-git-svn-dcommit-clobber-series.sh
@@ -20,8 +20,8 @@ test_expect_success '(supposedly) non-conflicting change from SVN' '
        test x"`sed -n -e 61p < file`" = x61 &&
        svn_cmd co "$svnrepo" tmp &&
        (cd tmp &&
        test x"`sed -n -e 61p < file`" = x61 &&
        svn_cmd co "$svnrepo" tmp &&
        (cd tmp &&

-               $PERL_PATH -i.bak -p -e "s/^58$/5588/" file &&
-               $PERL_PATH -i.bak -p -e "s/^61$/6611/" file &&
+               "$PERL_PATH" -i.bak -p -e "s/^58$/5588/" file &&
+               "$PERL_PATH" -i.bak -p -e "s/^61$/6611/" file &&

                poke file &&
                test x"`sed -n -e 58p < file`" = x5588 &&
                test x"`sed -n -e 61p < file`" = x6611 &&
                poke file &&
                test x"`sed -n -e 58p < file`" = x5588 &&
                test x"`sed -n -e 61p < file`" = x6611 &&


@@ -40,8 +40,8 @@ test_expect_success 'some unrelated changes to git' "
 test_expect_success 'change file but in unrelated area' "
        test x\"\`sed -n -e 4p < file\`\" = x4 &&
        test x\"\`sed -n -e 7p < file\`\" = x7 &&
 test_expect_success 'change file but in unrelated area' "
        test x\"\`sed -n -e 4p < file\`\" = x4 &&
        test x\"\`sed -n -e 7p < file\`\" = x7 &&

-       $PERL_PATH -i.bak -p -e 's/^4\$/4444/' file &&
-       $PERL_PATH -i.bak -p -e 's/^7\$/7777/' file &&
+       "$PERL_PATH" -i.bak -p -e 's/^4\$/4444/' file &&
+       "$PERL_PATH" -i.bak -p -e 's/^7\$/7777/' file &&

        test x\"\`sed -n -e 4p < file\`\" = x4444 &&
        test x\"\`sed -n -e 7p < file\`\" = x7777 &&
        git commit -m '4 => 4444, 7 => 7777' file &&
        test x\"\`sed -n -e 4p < file\`\" = x4444 &&
        test x\"\`sed -n -e 7p < file\`\" = x7777 &&
        git commit -m '4 => 4444, 7 => 7777' file &&

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 007e5af5f469664c89d2006fdc55a5fa85946582..11f977bec2e3b913a4beed59643be01ccad86435 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -12,7 +12,7 @@ test_description='test git fast-import utility'
 # This could be written as "head -c $1", but IRIX "head" does not
 # support the -c option.
 head_c () {
 # This could be written as "head -c $1", but IRIX "head" does not
 # support the -c option.
 head_c () {

-       $PERL_PATH -e '
+       "$PERL_PATH" -e '

                my $len = $ARGV[1];
                while ($len > 0) {
                        my $s;
                my $len = $ARGV[1];
                while ($len > 0) {
                        my $s;

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 6b6dc20fa4360f526fea34e872bf767c1b6a4be9..77447b70f4020a456f2ba3cac154cedf9162dea6 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -424,7 +424,7 @@ test_expect_success 'fast-export quotes pathnames' '
                --cacheinfo 100644 $blob "path with \\backslash" \
                --cacheinfo 100644 $blob "path with space" &&
         git commit -m addition &&
                --cacheinfo 100644 $blob "path with \\backslash" \
                --cacheinfo 100644 $blob "path with space" &&
         git commit -m addition &&

-        git ls-files -z -s | $PERL_PATH -0pe "s{\\t}{$&subdir/}" >index &&
+        git ls-files -z -s | "$PERL_PATH" -0pe "s{\\t}{$&subdir/}" >index &&

         git read-tree --empty &&
         git update-index -z --index-info <index &&
         git commit -m rename &&
         git read-tree --empty &&
         git update-index -z --index-info <index &&
         git commit -m rename &&

diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index ce38c10ac5a8b99a313c31bbbe8eaa406bf9c4c0..b00ad09d23d8e859d3b52c73579e84ad4620b36c 100755 (executable)
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -246,7 +246,7 @@ test_expect_success 'cope with rcs keyword expansion damage' '
                git config git-p4.attemptRCSCleanup true &&
                (cd ../cli && p4_append_to_file kwfile1.c) &&
                old_lines=$(wc -l <kwfile1.c) &&
                git config git-p4.attemptRCSCleanup true &&
                (cd ../cli && p4_append_to_file kwfile1.c) &&
                old_lines=$(wc -l <kwfile1.c) &&

-               $PERL_PATH -n -i -e "print unless m/Revision:/" kwfile1.c &&
+               "$PERL_PATH" -n -i -e "print unless m/Revision:/" kwfile1.c &&

                new_lines=$(wc -l <kwfile1.c) &&
                test $new_lines = $(($old_lines - 1)) &&
 
                new_lines=$(wc -l <kwfile1.c) &&
                test $new_lines = $(($old_lines - 1)) &&
 

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index fc0c0809905498c98fe0de3080b9972488ec2d55..16397691d951864f760b832ee066a63cd83f64fc 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -76,11 +76,11 @@ test_decode_color () {
 }
 
 nul_to_q () {
 }
 
 nul_to_q () {

-       $PERL_PATH -pe 'y/\000/Q/'
+       "$PERL_PATH" -pe 'y/\000/Q/'

 }
 
 q_to_nul () {
 }
 
 q_to_nul () {

-       $PERL_PATH -pe 'y/Q/\000/'
+       "$PERL_PATH" -pe 'y/Q/\000/'

 }
 
 q_to_cr () {
 }
 
 q_to_cr () {