t9100,t3419: enclose all test code in single-quotes

A few tests here use double-quotes around the snippets of
shell code to run the tests. None of these tests wants to do
any interpolation at all, and it just leads to an extra
layer of quoting around all double-quotes and dollar signs
inside the snippet.  Let's switch to single quotes, like
most other test scripts.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 217dd79b2e4b5c02ee27f3b913c37c489ec585f2..49f548cdb93d53d88723adcd1f414a4db4c14a73 100755 (executable)
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -73,17 +73,17 @@ do_tests () {
                run git format-patch --stdout --ignore-if-in-upstream master
        "
 
                run git format-patch --stdout --ignore-if-in-upstream master
        "
 

-       test_expect_success $pr 'detect upstream patch' "
+       test_expect_success $pr 'detect upstream patch' '

                git checkout -q master &&
                scramble file &&
                git add file &&
                git checkout -q master &&
                scramble file &&
                git add file &&

-               git commit -q -m 'change big file again' &&
+               git commit -q -m "change big file again" &&

                git checkout -q other^{} &&
                git rebase master &&
                git checkout -q other^{} &&
                git rebase master &&

-               test_must_fail test -n \"\$(git rev-list master...HEAD~)\"
-       "
+               test_must_fail test -n "$(git rev-list master...HEAD~)"
+       '

 
 

-       test_expect_success $pr 'do not drop patch' "
+       test_expect_success $pr 'do not drop patch' '

                git branch -f squashed master &&
                git checkout -q -f squashed &&
                git reset -q --soft HEAD~2 &&
                git branch -f squashed master &&
                git checkout -q -f squashed &&
                git reset -q --soft HEAD~2 &&


@@ -91,7 +91,7 @@ do_tests () {
                git checkout -q other^{} &&
                test_must_fail git rebase squashed &&
                rm -rf .git/rebase-apply
                git checkout -q other^{} &&
                test_must_fail git rebase squashed &&
                rm -rf .git/rebase-apply

-       "
+       '

 }
 
 do_tests 500
 }
 
 do_tests 500

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 6ec73ee5d7b8d5473e79d0e072384bb8d0314a09..28082b134fd54aafa38a4ac2964fd4c367e19fa2 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -217,11 +217,11 @@ EOF
 
 test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
 
 
 test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
 

-test_expect_success 'exit if remote refs are ambigious' "
+test_expect_success 'exit if remote refs are ambigious' '

         git config --add svn-remote.svn.fetch \
                bar:refs/remotes/git-svn &&
        test_must_fail git svn migrate
         git config --add svn-remote.svn.fetch \
                bar:refs/remotes/git-svn &&
        test_must_fail git svn migrate

-"
+'

 
 test_expect_success 'exit if init-ing a would clobber a URL' '
         svnadmin create "${PWD}/svnrepo2" &&
 
 test_expect_success 'exit if init-ing a would clobber a URL' '
         svnadmin create "${PWD}/svnrepo2" &&


@@ -259,26 +259,26 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
        git branch -D my-bar
        '
 
        git branch -D my-bar
        '
 

-test_expect_success 'able to dcommit to a subdirectory' "
+test_expect_success 'able to dcommit to a subdirectory' '

        git svn fetch -i bar &&
        git checkout -b my-bar refs/remotes/bar &&
        echo abc > d &&
        git update-index --add d &&
        git svn fetch -i bar &&
        git checkout -b my-bar refs/remotes/bar &&
        echo abc > d &&
        git update-index --add d &&

-       git commit -m '/bar/d should be in the log' &&
+       git commit -m "/bar/d should be in the log" &&

        git svn dcommit -i bar &&
        git svn dcommit -i bar &&

-       test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+       test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&

        mkdir newdir &&
        echo new > newdir/dir &&
        git update-index --add newdir/dir &&
        mkdir newdir &&
        echo new > newdir/dir &&
        git update-index --add newdir/dir &&

-       git commit -m 'add a new directory' &&
+       git commit -m "add a new directory" &&

        git svn dcommit -i bar &&
        git svn dcommit -i bar &&

-       test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+       test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&

        echo foo >> newdir/dir &&
        git update-index newdir/dir &&
        echo foo >> newdir/dir &&
        git update-index newdir/dir &&

-       git commit -m 'modify a file in new directory' &&
+       git commit -m "modify a file in new directory" &&

        git svn dcommit -i bar &&
        git svn dcommit -i bar &&

-       test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
-       "
+       test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'

 
 test_expect_success 'dcommit should not fail with a touched file' '
        test_commit "commit-new-file-foo2" foo2 &&
 
 test_expect_success 'dcommit should not fail with a touched file' '
        test_commit "commit-new-file-foo2" foo2 &&


@@ -291,13 +291,13 @@ test_expect_success 'rebase should not fail with a touched file' '
        git svn rebase
 '
 
        git svn rebase
 '
 

-test_expect_success 'able to set-tree to a subdirectory' "
+test_expect_success 'able to set-tree to a subdirectory' '

        echo cba > d &&
        git update-index d &&
        echo cba > d &&
        git update-index d &&

-       git commit -m 'update /bar/d' &&
+       git commit -m "update /bar/d" &&

        git svn set-tree -i bar HEAD &&
        git svn set-tree -i bar HEAD &&

-       test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
-       "
+       test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'

 
 test_expect_success 'git-svn works in a bare repository' '
        mkdir bare-repo &&
 
 test_expect_success 'git-svn works in a bare repository' '
        mkdir bare-repo &&