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>
Jeff King committed
May 13, 2016 at 16:47 UTC
577dfd03024f1913c6eba63b43a56d254e694347
2 files changed
+20
-20
t/t3419-rebase-patch-id.sh
+6
-6
@@ -73,17 +73,17 @@ do_tests () {
73
run git format-patch --stdout --ignore-if-in-upstream master
74
"
75
76
- test_expect_success $pr 'detect upstream patch' "
76
+ test_expect_success $pr 'detect upstream patch' '
77
git checkout -q master &&
78
scramble file &&
79
git add file &&
80
- git commit -q -m 'change big file again' &&
80
+ git commit -q -m "change big file again" &&
81
git checkout -q other^{} &&
82
git rebase master &&
83
- test_must_fail test -n \"\$(git rev-list master...HEAD~)\"
84
- "
83
+ test_must_fail test -n "$(git rev-list master...HEAD~)"
84
+ '
85
86
- test_expect_success $pr 'do not drop patch' "
86
+ test_expect_success $pr 'do not drop patch' '
87
git branch -f squashed master &&
88
git checkout -q -f squashed &&
89
git reset -q --soft HEAD~2 &&
@@ -91,7 +91,7 @@ do_tests () {
91
git checkout -q other^{} &&
92
test_must_fail git rebase squashed &&
93
rm -rf .git/rebase-apply
94
- "
94
+ '
95
}
96
97
do_tests 500
t/t9100-git-svn-basic.sh
+14
-14
@@ -217,11 +217,11 @@ EOF
217
218
test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
219
220
-test_expect_success 'exit if remote refs are ambigious' "
220
+test_expect_success 'exit if remote refs are ambigious' '
221
git config --add svn-remote.svn.fetch \
222
bar:refs/remotes/git-svn &&
223
test_must_fail git svn migrate
224
-"
224
+'
225
226
test_expect_success 'exit if init-ing a would clobber a URL' '
227
svnadmin create "${PWD}/svnrepo2" &&
@@ -259,26 +259,26 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
259
git branch -D my-bar
260
'
261
262
-test_expect_success 'able to dcommit to a subdirectory' "
262
+test_expect_success 'able to dcommit to a subdirectory' '
263
git svn fetch -i bar &&
264
git checkout -b my-bar refs/remotes/bar &&
265
echo abc > d &&
266
git update-index --add d &&
267
- git commit -m '/bar/d should be in the log' &&
267
+ git commit -m "/bar/d should be in the log" &&
268
git svn dcommit -i bar &&
269
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
269
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
270
mkdir newdir &&
271
echo new > newdir/dir &&
272
git update-index --add newdir/dir &&
273
- git commit -m 'add a new directory' &&
273
+ git commit -m "add a new directory" &&
274
git svn dcommit -i bar &&
275
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
275
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
276
echo foo >> newdir/dir &&
277
git update-index newdir/dir &&
278
- git commit -m 'modify a file in new directory' &&
278
+ git commit -m "modify a file in new directory" &&
279
git svn dcommit -i bar &&
280
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
281
- "
280
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
281
+'
282
283
test_expect_success 'dcommit should not fail with a touched file' '
284
test_commit "commit-new-file-foo2" foo2 &&
@@ -291,13 +291,13 @@ test_expect_success 'rebase should not fail with a touched file' '
291
git svn rebase
292
'
293
294
-test_expect_success 'able to set-tree to a subdirectory' "
294
+test_expect_success 'able to set-tree to a subdirectory' '
295
echo cba > d &&
296
git update-index d &&
297
- git commit -m 'update /bar/d' &&
297
+ git commit -m "update /bar/d" &&
298
git svn set-tree -i bar HEAD &&
299
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
300
- "
299
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
300
+'
301
302
test_expect_success 'git-svn works in a bare repository' '
303
mkdir bare-repo &&