undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/use-sq-from-test-lib'

Browse Source 
Code cleanup.

* dl/use-sq-from-test-lib:
  t: use common $SQ variable
This commit is contained in:
Junio C Hamano 2019-09-30 13:19:30 +09:00
commit d693345518
11 changed files with 51 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
t/t1300-config.sh
View File

@ -1294,26 +1294,25 @@ test_expect_success 'git -c is not confused by empty environment' '
GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
' '
sq="'"
test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' ' test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
cat >expect <<-\EOF && cat >expect <<-\EOF &&
env.one one env.one one
env.two two env.two two
EOF EOF
GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq} ${sq}env.two=two${sq}" \ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ} ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*" >actual && git config --get-regexp "env.*" >actual &&
test_cmp expect actual && test_cmp expect actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
env.one one${sq} env.one one${SQ}
env.two two env.two two
EOF EOF
GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq$sq$sq ${sq}env.two=two${sq}" \ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ$SQ$SQ ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*" >actual && git config --get-regexp "env.*" >actual &&
test_cmp expect actual && test_cmp expect actual &&
test_must_fail env \ test_must_fail env \
GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq ${sq}env.two=two${sq}" \ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*" git config --get-regexp "env.*"
' '

64
t/t1404-update-ref-errors.sh
View File

@ -32,8 +32,6 @@ test_update_rejected () {
test_cmp unchanged actual test_cmp unchanged actual
} }
Q="'"
# Test adding and deleting D/F-conflicting references in a single # Test adding and deleting D/F-conflicting references in a single
# transaction. # transaction.
df_test() { df_test() {
@ -93,7 +91,7 @@ df_test() {
delname="$delref" delname="$delref"
fi && fi &&
cat >expected-err <<-EOF && cat >expected-err <<-EOF &&
fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ
EOF EOF
$pack && $pack &&
if $add_del if $add_del
@ -123,7 +121,7 @@ test_expect_success 'existing loose ref is a simple prefix of new' '
prefix=refs/1l && prefix=refs/1l &&
test_update_rejected "a c e" false "b c/x d" \ test_update_rejected "a c e" false "b c/x d" \
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
' '
@ -131,7 +129,7 @@ test_expect_success 'existing packed ref is a simple prefix of new' '
prefix=refs/1p && prefix=refs/1p &&
test_update_rejected "a c e" true "b c/x d" \ test_update_rejected "a c e" true "b c/x d" \
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
' '
@ -139,7 +137,7 @@ test_expect_success 'existing loose ref is a deeper prefix of new' '
prefix=refs/2l && prefix=refs/2l &&
test_update_rejected "a c e" false "b c/x/y d" \ test_update_rejected "a c e" false "b c/x/y d" \
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
' '
@ -147,7 +145,7 @@ test_expect_success 'existing packed ref is a deeper prefix of new' '
prefix=refs/2p && prefix=refs/2p &&
test_update_rejected "a c e" true "b c/x/y d" \ test_update_rejected "a c e" true "b c/x/y d" \
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
' '
@ -155,7 +153,7 @@ test_expect_success 'new ref is a simple prefix of existing loose' '
prefix=refs/3l && prefix=refs/3l &&
test_update_rejected "a c/x e" false "b c d" \ test_update_rejected "a c/x e" false "b c d" \
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
' '
@ -163,7 +161,7 @@ test_expect_success 'new ref is a simple prefix of existing packed' '
prefix=refs/3p && prefix=refs/3p &&
test_update_rejected "a c/x e" true "b c d" \ test_update_rejected "a c/x e" true "b c d" \
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
' '
@ -171,7 +169,7 @@ test_expect_success 'new ref is a deeper prefix of existing loose' '
prefix=refs/4l && prefix=refs/4l &&
test_update_rejected "a c/x/y e" false "b c d" \ test_update_rejected "a c/x/y e" false "b c d" \
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
' '
@ -179,7 +177,7 @@ test_expect_success 'new ref is a deeper prefix of existing packed' '
prefix=refs/4p && prefix=refs/4p &&
test_update_rejected "a c/x/y e" true "b c d" \ test_update_rejected "a c/x/y e" true "b c d" \
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
' '
@ -187,7 +185,7 @@ test_expect_success 'one new ref is a simple prefix of another' '
prefix=refs/5 && prefix=refs/5 &&
test_update_rejected "a e" false "b c c/x d" \ test_update_rejected "a e" false "b c c/x d" \
"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time" "cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time"
' '
@ -334,7 +332,7 @@ test_expect_success 'D/F conflict prevents indirect delete long packed + indirec
test_expect_success 'missing old value blocks update' ' test_expect_success 'missing old value blocks update' '
prefix=refs/missing-update && prefix=refs/missing-update &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/foo $E $D" | printf "%s\n" "update $prefix/foo $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -345,7 +343,7 @@ test_expect_success 'incorrect old value blocks update' '
prefix=refs/incorrect-update && prefix=refs/incorrect-update &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "update $prefix/foo $E $D" | printf "%s\n" "update $prefix/foo $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -356,7 +354,7 @@ test_expect_success 'existing old value blocks create' '
prefix=refs/existing-create && prefix=refs/existing-create &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists
EOF EOF
printf "%s\n" "create $prefix/foo $E" | printf "%s\n" "create $prefix/foo $E" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -367,7 +365,7 @@ test_expect_success 'incorrect old value blocks delete' '
prefix=refs/incorrect-delete && prefix=refs/incorrect-delete &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "delete $prefix/foo $D" | printf "%s\n" "delete $prefix/foo $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -378,7 +376,7 @@ test_expect_success 'missing old value blocks indirect update' '
prefix=refs/missing-indirect-update && prefix=refs/missing-indirect-update &&
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/symref $E $D" | printf "%s\n" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -390,7 +388,7 @@ test_expect_success 'incorrect old value blocks indirect update' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "update $prefix/symref $E $D" | printf "%s\n" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -402,7 +400,7 @@ test_expect_success 'existing old value blocks indirect create' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
EOF EOF
printf "%s\n" "create $prefix/symref $E" | printf "%s\n" "create $prefix/symref $E" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -414,7 +412,7 @@ test_expect_success 'incorrect old value blocks indirect delete' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "delete $prefix/symref $D" | printf "%s\n" "delete $prefix/symref $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -425,7 +423,7 @@ test_expect_success 'missing old value blocks indirect no-deref update' '
prefix=refs/missing-noderef-update && prefix=refs/missing-noderef-update &&
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D
EOF EOF
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -437,7 +435,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref update' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -449,7 +447,7 @@ test_expect_success 'existing old value blocks indirect no-deref create' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
EOF EOF
printf "%s\n" "option no-deref" "create $prefix/symref $E" | printf "%s\n" "option no-deref" "create $prefix/symref $E" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -461,7 +459,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref delete' '
git symbolic-ref $prefix/symref $prefix/foo && git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C && git update-ref $prefix/foo $C &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF EOF
printf "%s\n" "option no-deref" "delete $prefix/symref $D" | printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -474,13 +472,13 @@ test_expect_success 'non-empty directory blocks create' '
: >.git/$prefix/foo/bar/baz.lock && : >.git/$prefix/foo/bar/baz.lock &&
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/foo $C" | printf "%s\n" "update $prefix/foo $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err && test_cmp expected output.err &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/foo $D $C" | printf "%s\n" "update $prefix/foo $D $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -493,13 +491,13 @@ test_expect_success 'broken reference blocks create' '
echo "gobbledigook" >.git/$prefix/foo && echo "gobbledigook" >.git/$prefix/foo &&
test_when_finished "rm -f .git/$prefix/foo" && test_when_finished "rm -f .git/$prefix/foo" &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF EOF
printf "%s\n" "update $prefix/foo $C" | printf "%s\n" "update $prefix/foo $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err && test_cmp expected output.err &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF EOF
printf "%s\n" "update $prefix/foo $D $C" | printf "%s\n" "update $prefix/foo $D $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -513,13 +511,13 @@ test_expect_success 'non-empty directory blocks indirect create' '
: >.git/$prefix/foo/bar/baz.lock && : >.git/$prefix/foo/bar/baz.lock &&
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/symref $C" | printf "%s\n" "update $prefix/symref $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err && test_cmp expected output.err &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF EOF
printf "%s\n" "update $prefix/symref $D $C" | printf "%s\n" "update $prefix/symref $D $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -532,13 +530,13 @@ test_expect_success 'broken reference blocks indirect create' '
echo "gobbledigook" >.git/$prefix/foo && echo "gobbledigook" >.git/$prefix/foo &&
test_when_finished "rm -f .git/$prefix/foo" && test_when_finished "rm -f .git/$prefix/foo" &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF EOF
printf "%s\n" "update $prefix/symref $C" | printf "%s\n" "update $prefix/symref $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err && test_cmp expected output.err &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF EOF
printf "%s\n" "update $prefix/symref $D $C" | printf "%s\n" "update $prefix/symref $D $C" |
test_must_fail git update-ref --stdin 2>output.err && test_must_fail git update-ref --stdin 2>output.err &&
@ -614,7 +612,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
test_when_finished "rm -f .git/packed-refs.lock" && test_when_finished "rm -f .git/packed-refs.lock" &&
test_must_fail git update-ref -d $prefix/foo >out 2>err && test_must_fail git update-ref -d $prefix/foo >out 2>err &&
git for-each-ref $prefix >actual && git for-each-ref $prefix >actual &&
test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: " err && test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err &&
test_cmp unchanged actual test_cmp unchanged actual
' '

3
t/t1414-reflog-walk.sh
View File

@ -18,10 +18,9 @@ do_walk () {
git log -g --format="%gd %gs" "$@" git log -g --format="%gd %gs" "$@"
} }
sq="'"
test_expect_success 'set up expected reflog' ' test_expect_success 'set up expected reflog' '
cat >expect.all <<-EOF cat >expect.all <<-EOF
HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side
HEAD@{1} commit: three HEAD@{1} commit: three
HEAD@{2} checkout: moving from master to side HEAD@{2} checkout: moving from master to side
HEAD@{3} commit: two HEAD@{3} commit: two

5
t/t1506-rev-parse-diagnosis.sh
View File

@ -8,10 +8,9 @@ exec </dev/null
test_did_you_mean () test_did_you_mean ()
{ {
sq="'" &&
cat >expected <<-EOF && cat >expected <<-EOF &&
fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}. fatal: Path '$2$3' $4, but not ${5:-$SQ$3$SQ}.
Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}? Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
EOF EOF
test_cmp expected error test_cmp expected error
} }

12
t/t1507-rev-parse-upstream.sh
View File

@ -28,8 +28,6 @@ test_expect_success 'setup' '
) )
' '
sq="'"
full_name () { full_name () {
(cd clone && (cd clone &&
git rev-parse --symbolic-full-name "$@") git rev-parse --symbolic-full-name "$@")
@ -129,7 +127,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
git branch -t new my-side@{u} && git branch -t new my-side@{u} &&
git merge -s ours new@{u} && git merge -s ours new@{u} &&
git show -s --pretty=tformat:%s >actual && git show -s --pretty=tformat:%s >actual &&
echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect && echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
test_cmp expect actual test_cmp expect actual
) )
' '
@ -156,7 +154,7 @@ test_expect_success 'branch@{u} works when tracking a local branch' '
test_expect_success 'branch@{u} error message when no upstream' ' test_expect_success 'branch@{u} error message when no upstream' '
cat >expect <<-EOF && cat >expect <<-EOF &&
fatal: no upstream configured for branch ${sq}non-tracking${sq} fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
EOF EOF
error_message non-tracking@{u} && error_message non-tracking@{u} &&
test_i18ncmp expect error test_i18ncmp expect error
@ -164,7 +162,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
test_expect_success '@{u} error message when no upstream' ' test_expect_success '@{u} error message when no upstream' '
cat >expect <<-EOF && cat >expect <<-EOF &&
fatal: no upstream configured for branch ${sq}master${sq} fatal: no upstream configured for branch ${SQ}master${SQ}
EOF EOF
test_must_fail git rev-parse --verify @{u} 2>actual && test_must_fail git rev-parse --verify @{u} 2>actual &&
test_i18ncmp expect actual test_i18ncmp expect actual
@ -172,7 +170,7 @@ test_expect_success '@{u} error message when no upstream' '
test_expect_success 'branch@{u} error message with misspelt branch' ' test_expect_success 'branch@{u} error message with misspelt branch' '
cat >expect <<-EOF && cat >expect <<-EOF &&
fatal: no such branch: ${sq}no-such-branch${sq} fatal: no such branch: ${SQ}no-such-branch${SQ}
EOF EOF
error_message no-such-branch@{u} && error_message no-such-branch@{u} &&
test_i18ncmp expect error test_i18ncmp expect error
@ -189,7 +187,7 @@ test_expect_success '@{u} error message when not on a branch' '
test_expect_success 'branch@{u} error message if upstream branch not fetched' ' test_expect_success 'branch@{u} error message if upstream branch not fetched' '
cat >expect <<-EOF && cat >expect <<-EOF &&
fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
EOF EOF
error_message bad-upstream@{u} && error_message bad-upstream@{u} &&
test_i18ncmp expect error test_i18ncmp expect error

10
t/t3005-ls-files-relative.sh
View File

@ -7,8 +7,6 @@ This test runs git ls-files with various relative path arguments.
. ./test-lib.sh . ./test-lib.sh
sq=\'
test_expect_success 'prepare' ' test_expect_success 'prepare' '
: >never-mind-me && : >never-mind-me &&
git add never-mind-me && git add never-mind-me &&
@ -42,9 +40,9 @@ test_expect_success 'ls-files -c' '
cd top/sub && cd top/sub &&
for f in ../y* for f in ../y*
do do
echo "error: pathspec $sq$f$sq did not match any file(s) known to git" echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err && done >expect.err &&
echo "Did you forget to ${sq}git add${sq}?" >>expect.err && echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../x* >expect.out && ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err && test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out && test_cmp expect.out actual.out &&
@ -57,9 +55,9 @@ test_expect_success 'ls-files -o' '
cd top/sub && cd top/sub &&
for f in ../x* for f in ../x*
do do
echo "error: pathspec $sq$f$sq did not match any file(s) known to git" echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err && done >expect.err &&
echo "Did you forget to ${sq}git add${sq}?" >>expect.err && echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../y* >expect.out && ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err && test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out && test_cmp expect.out actual.out &&

1
t/t3404-rebase-interactive.sh
View File

@ -1417,7 +1417,6 @@ test_expect_success 'editor saves as CR/LF' '
) )
' '
SQ="'"
test_expect_success 'rebase -i --gpg-sign=<key-id>' ' test_expect_success 'rebase -i --gpg-sign=<key-id>' '
test_when_finished "test_might_fail git rebase --abort" && test_when_finished "test_might_fail git rebase --abort" &&
set_fake_editor && set_fake_editor &&

1
t/t3430-rebase-merges.sh
View File

@ -158,7 +158,6 @@ test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' '
test_path_is_file .git/rebase-merge/patch test_path_is_file .git/rebase-merge/patch
' '
SQ="'"
test_expect_success 'failed `merge <branch>` does not crash' ' test_expect_success 'failed `merge <branch>` does not crash' '
test_when_finished "test_might_fail git rebase --abort" && test_when_finished "test_might_fail git rebase --abort" &&
git checkout conflicting-G && git checkout conflicting-G &&

1
t/t5601-clone.sh
View File

@ -434,7 +434,6 @@ test_expect_success 'double quoted plink.exe in GIT_SSH_COMMAND' '
expect_ssh "-v -P 123" myhost src expect_ssh "-v -P 123" myhost src
' '
SQ="'"
test_expect_success 'single quoted plink.exe in GIT_SSH_COMMAND' ' test_expect_success 'single quoted plink.exe in GIT_SSH_COMMAND' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" &&
GIT_SSH_COMMAND="$SQ$TRASH_DIRECTORY/plink.exe$SQ -v" \ GIT_SSH_COMMAND="$SQ$TRASH_DIRECTORY/plink.exe$SQ -v" \

3
t/t7406-submodule-update.sh
View File

@ -158,7 +158,6 @@ test_expect_success 'submodule update --init from and of subdirectory' '
test_i18ncmp expect2 actual2 test_i18ncmp expect2 actual2
' '
apos="'";
test_expect_success 'submodule update does not fetch already present commits' ' test_expect_success 'submodule update does not fetch already present commits' '
(cd submodule && (cd submodule &&
echo line3 >> file && echo line3 >> file &&
@ -168,7 +167,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
) && ) &&
(cd super/submodule && (cd super/submodule &&
head=$(git rev-parse --verify HEAD) && head=$(git rev-parse --verify HEAD) &&
echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected && echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
git reset --hard HEAD~1 git reset --hard HEAD~1
) && ) &&
(cd super && (cd super &&

3
t/test-lib.sh
View File

@ -509,6 +509,9 @@ EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
LF=' LF='
' '
# Single quote
SQ=\'
# UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores # UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores
# when case-folding filenames # when case-folding filenames
u200c=$(printf '\342\200\214') u200c=$(printf '\342\200\214')