]> git.ipfire.org Git - thirdparty/git.git/commit
t1404: mark directory/file conflict tests with REFFILES
authorHan-Wen Nienhuys <hanwen@google.com>
Mon, 29 Nov 2021 18:20:22 +0000 (18:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 23:09:32 +0000 (15:09 -0800)
commit911e9e88abeceb23fd6780d2cb6cf623957290a4
tree73277c2ccb207621d5c6a7f79a0e2956e687529d
parentcd3e606211bb1cf8bc57f7d76bab98cc17a150bc
t1404: mark directory/file conflict tests with REFFILES

The files backend uses file system locking on individual refs, which means a
directory/file conflict can prevent locks being taken. For example, in a repo
with just the ref "foo", an update

    (DELETE "foo") + (ADD "foo/bar")

cannot be executed in the files backend, as one cannot take a lock on foo/bar.

The current reftable proof-of-concept integration supports these tranactions, as
the result is a repo with just "foo/bar", which has no directory/file conflict.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t1404-update-ref-errors.sh