2015-05-11 23:25:03 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Test git update-ref with D/F conflicts'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_update_rejected () {
|
|
|
|
prefix="$1" &&
|
|
|
|
before="$2" &&
|
|
|
|
pack="$3" &&
|
|
|
|
create="$4" &&
|
|
|
|
error="$5" &&
|
|
|
|
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 &&
|
|
|
|
grep -F "$error" output.err &&
|
|
|
|
git for-each-ref $prefix >actual &&
|
|
|
|
test_cmp unchanged actual
|
|
|
|
}
|
|
|
|
|
|
|
|
Q="'"
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
|
|
|
git commit --allow-empty -m Initial &&
|
2016-05-05 19:22:23 +08:00
|
|
|
C=$(git rev-parse HEAD) &&
|
|
|
|
git commit --allow-empty -m Second &&
|
|
|
|
D=$(git rev-parse HEAD)
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'existing loose ref is a simple prefix of new' '
|
|
|
|
|
|
|
|
prefix=refs/1l &&
|
|
|
|
test_update_rejected $prefix "a c e" false "b c/x d" \
|
2015-05-11 23:25:16 +08:00
|
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'existing packed ref is a simple prefix of new' '
|
|
|
|
|
|
|
|
prefix=refs/1p &&
|
|
|
|
test_update_rejected $prefix "a c e" true "b c/x d" \
|
|
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'existing loose ref is a deeper prefix of new' '
|
|
|
|
|
|
|
|
prefix=refs/2l &&
|
|
|
|
test_update_rejected $prefix "a c e" false "b c/x/y d" \
|
2015-05-11 23:25:16 +08:00
|
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'existing packed ref is a deeper prefix of new' '
|
|
|
|
|
|
|
|
prefix=refs/2p &&
|
|
|
|
test_update_rejected $prefix "a c e" true "b c/x/y d" \
|
|
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing loose' '
|
|
|
|
|
|
|
|
prefix=refs/3l &&
|
|
|
|
test_update_rejected $prefix "a c/x e" false "b c d" \
|
2015-05-11 23:25:16 +08:00
|
|
|
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing packed' '
|
|
|
|
|
|
|
|
prefix=refs/3p &&
|
|
|
|
test_update_rejected $prefix "a c/x e" true "b c d" \
|
|
|
|
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing loose' '
|
|
|
|
|
|
|
|
prefix=refs/4l &&
|
|
|
|
test_update_rejected $prefix "a c/x/y e" false "b c d" \
|
2015-05-11 23:25:16 +08:00
|
|
|
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing packed' '
|
|
|
|
|
|
|
|
prefix=refs/4p &&
|
|
|
|
test_update_rejected $prefix "a c/x/y e" true "b c d" \
|
|
|
|
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
refs: check for D/F conflicts among refs created in a transaction
If two references that D/F conflict (e.g., "refs/foo" and
"refs/foo/bar") are created in a single transaction, the old code
discovered the problem only after the "commit" phase of
ref_transaction_commit() had already begun. This could leave some
references updated and others not, which violates the promise of
atomicity.
Instead, check for such conflicts during the "locking" phase:
* Teach is_refname_available() to take an "extras" parameter that can
contain extra reference names with which the specified refname must
not conflict.
* Change lock_ref_sha1_basic() to take an "extras" parameter, which it
passes through to is_refname_available().
* Change ref_transaction_commit() to pass "affected_refnames" to
lock_ref_sha1_basic() as its "extras" argument.
This change fixes a test case in t1404.
This code is a bit stricter than it needs to be. We could conceivably
allow reference "refs/foo/bar" to be created in the same transaction
as "refs/foo" is deleted (or vice versa). But that would be
complicated to implement, because it is not possible to lock
"refs/foo/bar" while "refs/foo" exists as a loose reference, but on
the other hand we don't want to delete some references before adding
others (because that could leave a gap during which required objects
are unreachable). There is also a complication that reflog files'
paths can conflict.
Any less-strict implementation would probably require tricks like the
packing of all references before the start of the real transaction, or
the use of temporary intermediate reference names.
So for now let's accept too-strict checks. Some reference update
transactions will be rejected unnecessarily, but they will be rejected
in their entirety rather than leaving the repository in an
intermediate state, as would happen now.
Please note that there is still one kind of D/F conflict that is *not*
handled correctly. If two processes are running at the same time, and
one tries to create "refs/foo" at the same time that the other tries
to create "refs/foo/bar", then they can race with each other. Both
processes can obtain their respective locks ("refs/foo.lock" and
"refs/foo/bar.lock"), proceed to the "commit" phase of
ref_transaction_commit(), and then the slower process will discover
that it cannot rename its lockfile into place (after possibly having
committed changes to other references). There appears to be no way to
fix this race without changing the locking policy, which in turn would
require a change to *all* Git clients.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
2015-05-11 23:25:12 +08:00
|
|
|
test_expect_success 'one new ref is a simple prefix of another' '
|
2015-05-11 23:25:03 +08:00
|
|
|
|
|
|
|
prefix=refs/5 &&
|
|
|
|
test_update_rejected $prefix "a e" false "b c c/x d" \
|
|
|
|
"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2016-05-05 19:22:23 +08:00
|
|
|
test_expect_failure 'empty directory should not fool rev-parse' '
|
|
|
|
prefix=refs/e-rev-parse &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
echo "$C" >expected &&
|
|
|
|
git rev-parse $prefix/foo >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool for-each-ref' '
|
|
|
|
prefix=refs/e-for-each-ref &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git for-each-ref $prefix >expected &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
git for-each-ref $prefix >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool create' '
|
|
|
|
prefix=refs/e-create &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "create %s $C\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool verify' '
|
|
|
|
prefix=refs/e-verify &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "verify %s $C\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool 1-arg update' '
|
|
|
|
prefix=refs/e-update-1 &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "update %s $D\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool 2-arg update' '
|
|
|
|
prefix=refs/e-update-2 &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "update %s $D $C\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool 0-arg delete' '
|
|
|
|
prefix=refs/e-delete-0 &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "delete %s\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'empty directory should not fool 1-arg delete' '
|
|
|
|
prefix=refs/e-delete-1 &&
|
|
|
|
git update-ref $prefix/foo $C &&
|
|
|
|
git pack-refs --all &&
|
|
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
|
|
printf "delete %s $C\n" $prefix/foo |
|
|
|
|
git update-ref --stdin
|
|
|
|
'
|
|
|
|
|
2015-05-11 23:25:03 +08:00
|
|
|
test_done
|