mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
![Michael Haggerty](/assets/img/avatar_default.png)
One of the tricks that `contrib/workdir/git-new-workdir` plays is to
making `packed-refs` in the new workdir a symlink to the `packed-refs`
file in the original repository. Before
42dfa7ecef
("commit_packed_refs(): use a staging file separate from
the lockfile", 2017-06-23), a lockfile was used as the staging file,
and because the `LOCK_NO_DEREF` was not used, the pointed-to file was
locked and modified.
But after that commit, the staging file was created using a tempfile,
with the end result that rewriting the `packed-refs` file in the
workdir overwrote the symlink rather than the original `packed-refs`
file.
Change `commit_packed_refs()` to use `get_locked_file_path()` to find
the path of the file that it should overwrite. Since that path was
properly resolved when the lockfile was created, this restores the
pre-42dfa7ecef behavior.
Also add a test case to document this use case and prevent a
regression like this from recurring.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
257 lines
7.5 KiB
Bash
Executable file
257 lines
7.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Amos Waterland
|
|
# Copyright (c) 2006 Christian Couder
|
|
#
|
|
|
|
test_description='git pack-refs should not change the branch semantic
|
|
|
|
This test runs git pack-refs and git show-ref and checks that the branch
|
|
semantic is still the same.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'enable reflogs' '
|
|
git config core.logallrefupdates true
|
|
'
|
|
|
|
test_expect_success \
|
|
'prepare a trivial repository' \
|
|
'echo Hello > A &&
|
|
git update-index --add A &&
|
|
git commit -m "Initial commit." &&
|
|
HEAD=$(git rev-parse --verify HEAD)'
|
|
|
|
SHA1=
|
|
|
|
test_expect_success \
|
|
'see if git show-ref works as expected' \
|
|
'git branch a &&
|
|
SHA1=$(cat .git/refs/heads/a) &&
|
|
echo "$SHA1 refs/heads/a" >expect &&
|
|
git show-ref a >result &&
|
|
test_cmp expect result'
|
|
|
|
test_expect_success \
|
|
'see if a branch still exists when packed' \
|
|
'git branch b &&
|
|
git pack-refs --all &&
|
|
rm -f .git/refs/heads/b &&
|
|
echo "$SHA1 refs/heads/b" >expect &&
|
|
git show-ref b >result &&
|
|
test_cmp expect result'
|
|
|
|
test_expect_success 'git branch c/d should barf if branch c exists' '
|
|
git branch c &&
|
|
git pack-refs --all &&
|
|
rm -f .git/refs/heads/c &&
|
|
test_must_fail git branch c/d
|
|
'
|
|
|
|
test_expect_success \
|
|
'see if a branch still exists after git pack-refs --prune' \
|
|
'git branch e &&
|
|
git pack-refs --all --prune &&
|
|
echo "$SHA1 refs/heads/e" >expect &&
|
|
git show-ref e >result &&
|
|
test_cmp expect result'
|
|
|
|
test_expect_success 'see if git pack-refs --prune remove ref files' '
|
|
git branch f &&
|
|
git pack-refs --all --prune &&
|
|
! test -f .git/refs/heads/f
|
|
'
|
|
|
|
test_expect_success 'see if git pack-refs --prune removes empty dirs' '
|
|
git branch r/s/t &&
|
|
git pack-refs --all --prune &&
|
|
! test -e .git/refs/heads/r
|
|
'
|
|
|
|
test_expect_success \
|
|
'git branch g should work when git branch g/h has been deleted' \
|
|
'git branch g/h &&
|
|
git pack-refs --all --prune &&
|
|
git branch -d g/h &&
|
|
git branch g &&
|
|
git pack-refs --all &&
|
|
git branch -d g'
|
|
|
|
test_expect_success 'git branch i/j/k should barf if branch i exists' '
|
|
git branch i &&
|
|
git pack-refs --all --prune &&
|
|
test_must_fail git branch i/j/k
|
|
'
|
|
|
|
test_expect_success \
|
|
'test git branch k after branch k/l/m and k/lm have been deleted' \
|
|
'git branch k/l &&
|
|
git branch k/lm &&
|
|
git branch -d k/l &&
|
|
git branch k/l/m &&
|
|
git branch -d k/l/m &&
|
|
git branch -d k/lm &&
|
|
git branch k'
|
|
|
|
test_expect_success \
|
|
'test git branch n after some branch deletion and pruning' \
|
|
'git branch n/o &&
|
|
git branch n/op &&
|
|
git branch -d n/o &&
|
|
git branch n/o/p &&
|
|
git branch -d n/op &&
|
|
git pack-refs --all --prune &&
|
|
git branch -d n/o/p &&
|
|
git branch n'
|
|
|
|
test_expect_success \
|
|
'see if up-to-date packed refs are preserved' \
|
|
'git branch q &&
|
|
git pack-refs --all --prune &&
|
|
git update-ref refs/heads/q refs/heads/q &&
|
|
! test -f .git/refs/heads/q'
|
|
|
|
test_expect_success 'pack, prune and repack' '
|
|
git tag foo &&
|
|
git pack-refs --all --prune &&
|
|
git show-ref >all-of-them &&
|
|
git pack-refs &&
|
|
git show-ref >again &&
|
|
test_cmp all-of-them again
|
|
'
|
|
|
|
test_expect_success 'explicit pack-refs with dangling packed reference' '
|
|
git commit --allow-empty -m "soon to be garbage-collected" &&
|
|
git pack-refs --all &&
|
|
git reset --hard HEAD^ &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git pack-refs --all 2>result &&
|
|
test_cmp /dev/null result
|
|
'
|
|
|
|
test_expect_success 'delete ref with dangling packed version' '
|
|
git checkout -b lamb &&
|
|
git commit --allow-empty -m "future garbage" &&
|
|
git pack-refs --all &&
|
|
git reset --hard HEAD^ &&
|
|
git checkout master &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git branch -d lamb 2>result &&
|
|
test_cmp /dev/null result
|
|
'
|
|
|
|
test_expect_success 'delete ref while another dangling packed ref' '
|
|
git branch lamb &&
|
|
git commit --allow-empty -m "future garbage" &&
|
|
git pack-refs --all &&
|
|
git reset --hard HEAD^ &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git branch -d lamb 2>result &&
|
|
test_cmp /dev/null result
|
|
'
|
|
|
|
test_expect_success 'pack ref directly below refs/' '
|
|
git update-ref refs/top HEAD &&
|
|
git pack-refs --all --prune &&
|
|
grep refs/top .git/packed-refs &&
|
|
test_path_is_missing .git/refs/top
|
|
'
|
|
|
|
test_expect_success 'do not pack ref in refs/bisect' '
|
|
git update-ref refs/bisect/local HEAD &&
|
|
git pack-refs --all --prune &&
|
|
! grep refs/bisect/local .git/packed-refs >/dev/null &&
|
|
test_path_is_file .git/refs/bisect/local
|
|
'
|
|
|
|
test_expect_success 'disable reflogs' '
|
|
git config core.logallrefupdates false &&
|
|
rm -rf .git/logs
|
|
'
|
|
|
|
test_expect_success 'create packed foo/bar/baz branch' '
|
|
git branch foo/bar/baz &&
|
|
git pack-refs --all --prune &&
|
|
test_path_is_missing .git/refs/heads/foo/bar/baz &&
|
|
test_must_fail git reflog exists refs/heads/foo/bar/baz
|
|
'
|
|
|
|
test_expect_success 'notice d/f conflict with existing directory' '
|
|
test_must_fail git branch foo &&
|
|
test_must_fail git branch foo/bar
|
|
'
|
|
|
|
test_expect_success 'existing directory reports concrete ref' '
|
|
test_must_fail git branch foo 2>stderr &&
|
|
grep refs/heads/foo/bar/baz stderr
|
|
'
|
|
|
|
test_expect_success 'notice d/f conflict with existing ref' '
|
|
test_must_fail git branch foo/bar/baz/extra &&
|
|
test_must_fail git branch foo/bar/baz/lots/of/extra/components
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs with unterminated line' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
|
|
echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs containing junk' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%s\n" "bogus content" >>.git/packed-refs &&
|
|
echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs with a short SHA-1' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
|
|
printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'timeout if packed-refs.lock exists' '
|
|
LOCK=.git/packed-refs.lock &&
|
|
>"$LOCK" &&
|
|
test_when_finished "rm -f $LOCK" &&
|
|
test_must_fail git pack-refs --all --prune
|
|
'
|
|
|
|
test_expect_success 'retry acquiring packed-refs.lock' '
|
|
LOCK=.git/packed-refs.lock &&
|
|
>"$LOCK" &&
|
|
test_when_finished "wait; rm -f $LOCK" &&
|
|
{
|
|
( sleep 1 ; rm -f $LOCK ) &
|
|
} &&
|
|
git -c core.packedrefstimeout=3000 pack-refs --all --prune
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'pack symlinked packed-refs' '
|
|
# First make sure that symlinking works when reading:
|
|
git update-ref refs/heads/loosy refs/heads/master &&
|
|
git for-each-ref >all-refs-before &&
|
|
mv .git/packed-refs .git/my-deviant-packed-refs &&
|
|
ln -s my-deviant-packed-refs .git/packed-refs &&
|
|
git for-each-ref >all-refs-linked &&
|
|
test_cmp all-refs-before all-refs-linked &&
|
|
git pack-refs --all --prune &&
|
|
git for-each-ref >all-refs-packed &&
|
|
test_cmp all-refs-before all-refs-packed &&
|
|
test -h .git/packed-refs &&
|
|
test "$(readlink .git/packed-refs)" = "my-deviant-packed-refs"
|
|
'
|
|
|
|
test_done
|