
When fetching references from a remote we by default also fetch all tags which point into the history we have fetched. This is a separate step performed after updating local references because it requires us to walk over the history on the client-side to determine whether the remote has announced any tags which point to one of the fetched commits. This backfilling of tags isn't covered by the `--atomic` flag: right now, it only applies to the step where we update our local references. This is an oversight at the time the flag was introduced: its purpose is to either update all references or none, but right now we happily update local references even in the case where backfilling failed. Fix this by pulling up creation of the reference transaction such that we can pass the same transaction to both the code which updates local references and to the code which backfills tags. This allows us to only commit the transaction in case both actions succeed. Note that we also have to start passing the transaction into `find_non_local_tags()`: this function is responsible for finding all tags which we need to backfill. Right now, it will happily return tags which have already been updated with our local references. But when we use a single transaction for both local references and backfilling then it may happen that we try to queue the same reference update twice to the transaction, which consequently triggers a bug. We thus have to skip over any tags which have already been queued. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
238 lines
5.5 KiB
Bash
Executable File
238 lines
5.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test automatic tag following'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
# End state of the repository:
|
|
#
|
|
# T - tag1 S - tag2
|
|
# / /
|
|
# L - A ------ O ------ B
|
|
# \ \ \
|
|
# \ C - origin/cat \
|
|
# origin/main main
|
|
|
|
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<";
|
|
next unless $F[2] eq "want";
|
|
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/main)
|
|
) &&
|
|
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 main
|
|
'
|
|
|
|
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/main) &&
|
|
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 main 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/main) &&
|
|
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_expect_success 'atomic fetch with failing backfill' '
|
|
git init clone3 &&
|
|
|
|
# We want to test whether a failure when backfilling tags correctly
|
|
# aborts the complete transaction when `--atomic` is passed: we should
|
|
# neither create the branch nor should we create the tag when either
|
|
# one of both fails to update correctly.
|
|
#
|
|
# To trigger failure we simply abort when backfilling a tag.
|
|
write_script clone3/.git/hooks/reference-transaction <<-\EOF &&
|
|
while read oldrev newrev reference
|
|
do
|
|
if test "$reference" = refs/tags/tag1
|
|
then
|
|
exit 1
|
|
fi
|
|
done
|
|
EOF
|
|
|
|
test_must_fail git -C clone3 fetch --atomic .. $B:refs/heads/something &&
|
|
test_must_fail git -C clone3 rev-parse --verify refs/heads/something &&
|
|
test_must_fail git -C clone3 rev-parse --verify refs/tags/tag2
|
|
'
|
|
|
|
test_expect_success 'atomic fetch with backfill should use single transaction' '
|
|
git init clone4 &&
|
|
|
|
# Fetching with the `--atomic` flag should update all references in a
|
|
# single transaction, including backfilled tags. We thus expect to see
|
|
# a single reference transaction for the created branch and tags.
|
|
cat >expected <<-EOF &&
|
|
prepared
|
|
$ZERO_OID $B refs/heads/something
|
|
$ZERO_OID $S refs/tags/tag2
|
|
$ZERO_OID $T refs/tags/tag1
|
|
committed
|
|
$ZERO_OID $B refs/heads/something
|
|
$ZERO_OID $S refs/tags/tag2
|
|
$ZERO_OID $T refs/tags/tag1
|
|
EOF
|
|
|
|
write_script clone4/.git/hooks/reference-transaction <<-\EOF &&
|
|
( echo "$*" && cat ) >>actual
|
|
EOF
|
|
|
|
git -C clone4 fetch --atomic .. $B:refs/heads/something &&
|
|
test_cmp expected clone4/actual
|
|
'
|
|
|
|
test_expect_success 'backfill failure causes command to fail' '
|
|
git init clone5 &&
|
|
|
|
write_script clone5/.git/hooks/reference-transaction <<-EOF &&
|
|
while read oldrev newrev reference
|
|
do
|
|
if test "\$reference" = refs/tags/tag1
|
|
then
|
|
# Create a nested tag below the actual tag we
|
|
# wanted to write, which causes a D/F conflict
|
|
# later when we want to commit refs/tags/tag1.
|
|
# We cannot just `exit 1` here given that this
|
|
# would cause us to die immediately.
|
|
git update-ref refs/tags/tag1/nested $B
|
|
exit \$!
|
|
fi
|
|
done
|
|
EOF
|
|
|
|
test_must_fail git -C clone5 fetch .. $B:refs/heads/something &&
|
|
test $B = $(git -C clone5 rev-parse --verify refs/heads/something) &&
|
|
test $S = $(git -C clone5 rev-parse --verify tag2) &&
|
|
test_must_fail git -C clone5 rev-parse --verify tag1
|
|
'
|
|
|
|
test_done
|