development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Jeff King 2016-05-13 16:47:18 -04:00 committed by Junio C Hamano
parent e1c0c158b1
commit 577dfd0302
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
t/t3419-rebase-patch-id.sh
View file

@ -73,17 +73,17 @@ do_tests () {
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 commit -q -m 'change big file again' &&
git commit -q -m "change big file again" &&
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 &&
@ -91,7 +91,7 @@ do_tests () {
git checkout -q other^{} &&
test_must_fail git rebase squashed &&
rm -rf .git/rebase-apply
"
'
}
do_tests 500

28
t/t9100-git-svn-basic.sh
View file

@ -217,11 +217,11 @@ EOF
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
"
'
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
'
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 commit -m '/bar/d should be in the log' &&
git commit -m "/bar/d should be in the log" &&
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 &&
git commit -m 'add a new directory' &&
git commit -m "add a new directory" &&
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 &&
git commit -m 'modify a file in new directory' &&
git commit -m "modify a file in new directory" &&
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 &&
@ -291,13 +291,13 @@ test_expect_success 'rebase should not fail with a touched file' '
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 &&
git commit -m 'update /bar/d' &&
git commit -m "update /bar/d" &&
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 &&