mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
a6a4a88af0
Many tests have an initial setup step that might fail based on whether earlier tests in the script have succeeded or not. Using a trick like "|| true" breaks the &&-chain, missing earlier failures (and fooling --chain-lint). We can use test_might_fail in some cases, which is correct and makes the intent more obvious. We can also use test_unconfig for unsetting config (and which is more robust, as well). The case in t9500 is an oddball. It wants to run cmd1 _or_ cmd2, and does it like: cmd1 || cmd2 && other_stuff It's not wrong in this case, but it's a bad habit to get into, because it breaks the &&-chain if used anywhere except at the beginning of the test (and we use the correct solution here, putting it inside a block for precedence). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
160 lines
3.1 KiB
Bash
Executable file
160 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test automatic tag following'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# End state of the repository:
|
|
#
|
|
# T - tag1 S - tag2
|
|
# / /
|
|
# L - A ------ O ------ B
|
|
# \ \ \
|
|
# \ C - origin/cat \
|
|
# origin/master master
|
|
|
|
test_expect_success setup '
|
|
test_tick &&
|
|
echo ichi >file &&
|
|
git add file &&
|
|
git commit -m L &&
|
|
L=$(git rev-parse --verify HEAD) &&
|
|
|
|
(
|
|
mkdir cloned &&
|
|
cd cloned &&
|
|
git init-db &&
|
|
git remote add -f origin ..
|
|
) &&
|
|
|
|
test_tick &&
|
|
echo A >file &&
|
|
git add file &&
|
|
git commit -m A &&
|
|
A=$(git rev-parse --verify HEAD)
|
|
'
|
|
|
|
U=UPLOAD_LOG
|
|
UPATH="$(pwd)/$U"
|
|
|
|
test_expect_success 'setup expect' '
|
|
cat - <<EOF >expect
|
|
want $A
|
|
EOF
|
|
'
|
|
|
|
get_needs () {
|
|
test -s "$1" &&
|
|
perl -alne '
|
|
next unless $F[1] eq "upload-pack<";
|
|
last if $F[2] eq "0000";
|
|
print $F[2], " ", $F[3];
|
|
' "$1"
|
|
}
|
|
|
|
test_expect_success 'fetch A (new commit : 1 connection)' '
|
|
rm -f $U &&
|
|
(
|
|
cd cloned &&
|
|
GIT_TRACE_PACKET=$UPATH git fetch &&
|
|
test $A = $(git rev-parse --verify origin/master)
|
|
) &&
|
|
get_needs $U >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "create tag T on A, create C on branch cat" '
|
|
git tag -a -m tag1 tag1 $A &&
|
|
T=$(git rev-parse --verify tag1) &&
|
|
|
|
git checkout -b cat &&
|
|
echo C >file &&
|
|
git add file &&
|
|
git commit -m C &&
|
|
C=$(git rev-parse --verify HEAD) &&
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success 'setup expect' '
|
|
cat - <<EOF >expect
|
|
want $C
|
|
want $T
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '
|
|
rm -f $U &&
|
|
(
|
|
cd cloned &&
|
|
GIT_TRACE_PACKET=$UPATH git fetch &&
|
|
test $C = $(git rev-parse --verify origin/cat) &&
|
|
test $T = $(git rev-parse --verify tag1) &&
|
|
test $A = $(git rev-parse --verify tag1^0)
|
|
) &&
|
|
get_needs $U >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "create commits O, B, tag S on B" '
|
|
test_tick &&
|
|
echo O >file &&
|
|
git add file &&
|
|
git commit -m O &&
|
|
|
|
test_tick &&
|
|
echo B >file &&
|
|
git add file &&
|
|
git commit -m B &&
|
|
B=$(git rev-parse --verify HEAD) &&
|
|
|
|
git tag -a -m tag2 tag2 $B &&
|
|
S=$(git rev-parse --verify tag2)
|
|
'
|
|
|
|
test_expect_success 'setup expect' '
|
|
cat - <<EOF >expect
|
|
want $B
|
|
want $S
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
|
|
rm -f $U &&
|
|
(
|
|
cd cloned &&
|
|
GIT_TRACE_PACKET=$UPATH git fetch &&
|
|
test $B = $(git rev-parse --verify origin/master) &&
|
|
test $B = $(git rev-parse --verify tag2^0) &&
|
|
test $S = $(git rev-parse --verify tag2)
|
|
) &&
|
|
get_needs $U >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'setup expect' '
|
|
cat - <<EOF >expect
|
|
want $B
|
|
want $S
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'new clone fetch master and tags' '
|
|
test_might_fail git branch -D cat &&
|
|
rm -f $U &&
|
|
(
|
|
mkdir clone2 &&
|
|
cd clone2 &&
|
|
git init &&
|
|
git remote add origin .. &&
|
|
GIT_TRACE_PACKET=$UPATH git fetch &&
|
|
test $B = $(git rev-parse --verify origin/master) &&
|
|
test $S = $(git rev-parse --verify tag2) &&
|
|
test $B = $(git rev-parse --verify tag2^0) &&
|
|
test $T = $(git rev-parse --verify tag1) &&
|
|
test $A = $(git rev-parse --verify tag1^0)
|
|
) &&
|
|
get_needs $U >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|