mirror of
https://github.com/git/git
synced 2024-09-29 21:27:13 +00:00
f6b75726b2
The t1404 script checks a lot of output from Git which contains single quotes. Because the test snippets are themselves wrapped in the same single-quotes, we have to resort to using $SQ to match them. This is error-prone and makes the tests harder to read. Instead, let's use the new here-doc feature added in the previous commit, which lets us write anything in the test body we want (except the here-doc end marker on a line by itself, of course). Note that we do use "\" in our marker to avoid interpolation (which is the whole point). But we don't use "<<-", as we want to preserve whitespace in the snippet (and running with "-v" before and after shows that we produce the exact same output, except with the ugly $SQ references fixed). I just converted every test here, even though only some of them use $SQ. But it would be equally correct to mix-and-match styles if we don't mind the inconsistency. I've also converted a few tests in t0600 which were moved from t1404 (I had written this patch before they were moved, but it seemed worth porting over the changes rather than losing them). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
397 lines
12 KiB
Bash
Executable file
397 lines
12 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test git update-ref error handling'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
# Create some references, perhaps run pack-refs --all, then try to
|
|
# create some more references. Ensure that the second creation fails
|
|
# with the correct error message.
|
|
# Usage: test_update_rejected <before> <pack> <create> <error>
|
|
# <before> is a ws-separated list of refs to create before the test
|
|
# <pack> (true or false) tells whether to pack the refs before the test
|
|
# <create> is a list of variables to attempt creating
|
|
# <error> is a string to look for in the stderr of update-ref.
|
|
# All references are created in the namespace specified by the current
|
|
# value of $prefix.
|
|
test_update_rejected () {
|
|
before="$1" &&
|
|
pack="$2" &&
|
|
create="$3" &&
|
|
error="$4" &&
|
|
printf "create $prefix/%s $C\n" $before |
|
|
git update-ref --stdin &&
|
|
git for-each-ref $prefix >unchanged &&
|
|
if $pack
|
|
then
|
|
git pack-refs --all
|
|
fi &&
|
|
printf "create $prefix/%s $C\n" $create >input &&
|
|
test_must_fail git update-ref --stdin <input 2>output.err &&
|
|
test_grep -F "$error" output.err &&
|
|
git for-each-ref $prefix >actual &&
|
|
test_cmp unchanged actual
|
|
}
|
|
|
|
# Test adding and deleting D/F-conflicting references in a single
|
|
# transaction.
|
|
df_test() {
|
|
prefix="$1"
|
|
pack=: symadd=false symdel=false add_del=false addref= delref=
|
|
shift
|
|
while test $# -gt 0
|
|
do
|
|
case "$1" in
|
|
--pack)
|
|
pack="git pack-refs --all"
|
|
shift
|
|
;;
|
|
--sym-add)
|
|
# Perform the add via a symbolic reference
|
|
symadd=true
|
|
shift
|
|
;;
|
|
--sym-del)
|
|
# Perform the del via a symbolic reference
|
|
symdel=true
|
|
shift
|
|
;;
|
|
--del-add)
|
|
# Delete first reference then add second
|
|
add_del=false
|
|
delref="$prefix/r/$2"
|
|
addref="$prefix/r/$3"
|
|
shift 3
|
|
;;
|
|
--add-del)
|
|
# Add first reference then delete second
|
|
add_del=true
|
|
addref="$prefix/r/$2"
|
|
delref="$prefix/r/$3"
|
|
shift 3
|
|
;;
|
|
*)
|
|
echo 1>&2 "Extra args to df_test: $*"
|
|
return 1
|
|
;;
|
|
esac
|
|
done
|
|
git update-ref "$delref" $C &&
|
|
if $symadd
|
|
then
|
|
addname="$prefix/s/symadd" &&
|
|
git symbolic-ref "$addname" "$addref"
|
|
else
|
|
addname="$addref"
|
|
fi &&
|
|
if $symdel
|
|
then
|
|
delname="$prefix/s/symdel" &&
|
|
git symbolic-ref "$delname" "$delref"
|
|
else
|
|
delname="$delref"
|
|
fi &&
|
|
$pack &&
|
|
if $add_del
|
|
then
|
|
printf "%s\n" "create $addname $D" "delete $delname"
|
|
else
|
|
printf "%s\n" "delete $delname" "create $addname $D"
|
|
fi >commands &&
|
|
test_must_fail git update-ref --stdin <commands 2>output.err &&
|
|
grep -E "fatal:( cannot lock ref '$addname':)? '$delref' exists; cannot create '$addref'" output.err &&
|
|
printf "%s\n" "$C $delref" >expected-refs &&
|
|
git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
|
|
test_cmp expected-refs actual-refs
|
|
}
|
|
|
|
test_expect_success 'setup' - <<\EOT
|
|
|
|
git commit --allow-empty -m Initial &&
|
|
C=$(git rev-parse HEAD) &&
|
|
git commit --allow-empty -m Second &&
|
|
D=$(git rev-parse HEAD) &&
|
|
git commit --allow-empty -m Third &&
|
|
E=$(git rev-parse HEAD)
|
|
EOT
|
|
|
|
test_expect_success 'existing loose ref is a simple prefix of new' - <<\EOT
|
|
|
|
prefix=refs/1l &&
|
|
test_update_rejected "a c e" false "b c/x d" \
|
|
"'$prefix/c' exists; cannot create '$prefix/c/x'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'existing packed ref is a simple prefix of new' - <<\EOT
|
|
|
|
prefix=refs/1p &&
|
|
test_update_rejected "a c e" true "b c/x d" \
|
|
"'$prefix/c' exists; cannot create '$prefix/c/x'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'existing loose ref is a deeper prefix of new' - <<\EOT
|
|
|
|
prefix=refs/2l &&
|
|
test_update_rejected "a c e" false "b c/x/y d" \
|
|
"'$prefix/c' exists; cannot create '$prefix/c/x/y'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'existing packed ref is a deeper prefix of new' - <<\EOT
|
|
|
|
prefix=refs/2p &&
|
|
test_update_rejected "a c e" true "b c/x/y d" \
|
|
"'$prefix/c' exists; cannot create '$prefix/c/x/y'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing loose' - <<\EOT
|
|
|
|
prefix=refs/3l &&
|
|
test_update_rejected "a c/x e" false "b c d" \
|
|
"'$prefix/c/x' exists; cannot create '$prefix/c'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing packed' - <<\EOT
|
|
|
|
prefix=refs/3p &&
|
|
test_update_rejected "a c/x e" true "b c d" \
|
|
"'$prefix/c/x' exists; cannot create '$prefix/c'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing loose' - <<\EOT
|
|
|
|
prefix=refs/4l &&
|
|
test_update_rejected "a c/x/y e" false "b c d" \
|
|
"'$prefix/c/x/y' exists; cannot create '$prefix/c'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing packed' - <<\EOT
|
|
|
|
prefix=refs/4p &&
|
|
test_update_rejected "a c/x/y e" true "b c d" \
|
|
"'$prefix/c/x/y' exists; cannot create '$prefix/c'"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'one new ref is a simple prefix of another' - <<\EOT
|
|
|
|
prefix=refs/5 &&
|
|
test_update_rejected "a e" false "b c c/x d" \
|
|
"cannot process '$prefix/c' and '$prefix/c/x' at the same time"
|
|
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents add long + delete short' - <<\EOT
|
|
df_test refs/df-al-ds --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents add short + delete long' - <<\EOT
|
|
df_test refs/df-as-dl --add-del foo foo/bar
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents delete long + add short' - <<\EOT
|
|
df_test refs/df-dl-as --del-add foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents delete short + add long' - <<\EOT
|
|
df_test refs/df-ds-al --del-add foo foo/bar
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents add long + delete short packed' - <<\EOT
|
|
df_test refs/df-al-dsp --pack --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents add short + delete long packed' - <<\EOT
|
|
df_test refs/df-as-dlp --pack --add-del foo foo/bar
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents delete long packed + add short' - <<\EOT
|
|
df_test refs/df-dlp-as --pack --del-add foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents delete short packed + add long' - <<\EOT
|
|
df_test refs/df-dsp-al --pack --del-add foo foo/bar
|
|
EOT
|
|
|
|
# Try some combinations involving symbolic refs...
|
|
|
|
test_expect_success 'D/F conflict prevents indirect add long + delete short' - <<\EOT
|
|
df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' - <<\EOT
|
|
df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' - <<\EOT
|
|
df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' - <<\EOT
|
|
df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect add long + delete short packed' - <<\EOT
|
|
df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' - <<\EOT
|
|
df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents add long + indirect delete short packed' - <<\EOT
|
|
df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
|
|
EOT
|
|
|
|
test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' - <<\EOT
|
|
df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
|
|
EOT
|
|
|
|
# Test various errors when reading the old values of references...
|
|
|
|
test_expect_success 'missing old value blocks update' - <<\EOT
|
|
prefix=refs/missing-update &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo'
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks update' - <<\EOT
|
|
prefix=refs/incorrect-update &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/foo': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'existing old value blocks create' - <<\EOT
|
|
prefix=refs/existing-create &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/foo': reference already exists
|
|
EOF
|
|
printf "%s\n" "create $prefix/foo $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks delete' - <<\EOT
|
|
prefix=refs/incorrect-delete &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/foo': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "delete $prefix/foo $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'missing old value blocks indirect update' - <<\EOT
|
|
prefix=refs/missing-indirect-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo'
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks indirect update' - <<\EOT
|
|
prefix=refs/incorrect-indirect-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'existing old value blocks indirect create' - <<\EOT
|
|
prefix=refs/existing-indirect-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': reference already exists
|
|
EOF
|
|
printf "%s\n" "create $prefix/symref $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks indirect delete' - <<\EOT
|
|
prefix=refs/incorrect-indirect-delete &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "delete $prefix/symref $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'missing old value blocks indirect no-deref update' - <<\EOT
|
|
prefix=refs/missing-noderef-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': reference is missing but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks indirect no-deref update' - <<\EOT
|
|
prefix=refs/incorrect-noderef-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'existing old value blocks indirect no-deref create' - <<\EOT
|
|
prefix=refs/existing-noderef-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': reference already exists
|
|
EOF
|
|
printf "%s\n" "option no-deref" "create $prefix/symref $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_expect_success 'incorrect old value blocks indirect no-deref delete' - <<\EOT
|
|
prefix=refs/incorrect-noderef-delete &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref '$prefix/symref': is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
EOT
|
|
|
|
test_done
|