371a655074
It's annoying not to be able to put comments and empty lines in the
skipList, when e.g. keeping a big central list of commits to skip in
/etc/gitconfig, which was my motivation for 1362df0d41 ("fetch:
implement fetch.fsck.*", 2018-07-27).
Implement that, and document what version of Git this was changed in,
since this on-disk format can be expected to be used by multiple
versions of git.
There is no notable performance impact from this change, using the
test setup described a couple of commits back:
Test HEAD~ HEAD
----------------------------------------------------------------------------------------
1450.3: fsck with 0 skipped bad commits 7.69(7.27+0.42) 7.86(7.48+0.37) +2.2%
1450.5: fsck with 1 skipped bad commits 7.69(7.30+0.38) 7.83(7.47+0.36) +1.8%
1450.7: fsck with 10 skipped bad commits 7.76(7.38+0.38) 7.79(7.38+0.41) +0.4%
1450.9: fsck with 100 skipped bad commits 7.76(7.38+0.38) 7.74(7.36+0.38) -0.3%
1450.11: fsck with 1000 skipped bad commits 7.71(7.30+0.41) 7.72(7.34+0.38) +0.1%
1450.13: fsck with 10000 skipped bad commits 7.74(7.34+0.40) 7.72(7.34+0.38) -0.3%
1450.15: fsck with 100000 skipped bad commits 7.75(7.40+0.35) 7.70(7.29+0.40) -0.6%
1450.17: fsck with 1000000 skipped bad commits 7.12(6.86+0.26) 7.13(6.87+0.26) +0.1%
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
352 lines
11 KiB
Bash
Executable File
352 lines
11 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='fetch/receive strict mode'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup and inject "corrupt or missing" object' '
|
|
echo hello >greetings &&
|
|
git add greetings &&
|
|
git commit -m greetings &&
|
|
|
|
S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
|
|
X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
|
|
echo $S >S &&
|
|
echo $X >X &&
|
|
cp .git/objects/$S .git/objects/$S.back &&
|
|
mv -f .git/objects/$X .git/objects/$S &&
|
|
|
|
test_must_fail git fsck
|
|
'
|
|
|
|
test_expect_success 'fetch without strict' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config fetch.fsckobjects false &&
|
|
git config transfer.fsckobjects false &&
|
|
test_must_fail git fetch ../.git master
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch with !fetch.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config fetch.fsckobjects false &&
|
|
git config transfer.fsckobjects true &&
|
|
test_must_fail git fetch ../.git master
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch with fetch.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config fetch.fsckobjects true &&
|
|
git config transfer.fsckobjects false &&
|
|
test_must_fail git fetch ../.git master
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch with transfer.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config transfer.fsckobjects true &&
|
|
test_must_fail git fetch ../.git master
|
|
)
|
|
'
|
|
|
|
cat >exp <<EOF
|
|
To dst
|
|
! refs/heads/master:refs/heads/test [remote rejected] (missing necessary objects)
|
|
EOF
|
|
|
|
test_expect_success 'push without strict' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config fetch.fsckobjects false &&
|
|
git config transfer.fsckobjects false
|
|
) &&
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
test_cmp exp act
|
|
'
|
|
|
|
test_expect_success 'push with !receive.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config receive.fsckobjects false &&
|
|
git config transfer.fsckobjects true
|
|
) &&
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
test_cmp exp act
|
|
'
|
|
|
|
cat >exp <<EOF
|
|
To dst
|
|
! refs/heads/master:refs/heads/test [remote rejected] (unpacker error)
|
|
EOF
|
|
|
|
test_expect_success 'push with receive.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config receive.fsckobjects true &&
|
|
git config transfer.fsckobjects false
|
|
) &&
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
test_cmp exp act
|
|
'
|
|
|
|
test_expect_success 'push with transfer.fsckobjects' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
(
|
|
cd dst &&
|
|
git config transfer.fsckobjects true
|
|
) &&
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
test_cmp exp act
|
|
'
|
|
|
|
test_expect_success 'repair the "corrupt or missing" object' '
|
|
mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
|
|
mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
|
|
rm -rf .git/objects/$(cat X) &&
|
|
git fsck
|
|
'
|
|
|
|
cat >bogus-commit <<EOF
|
|
tree $EMPTY_TREE
|
|
author Bugs Bunny 1234567890 +0000
|
|
committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
|
|
|
|
This commit object intentionally broken
|
|
EOF
|
|
|
|
test_expect_success 'setup bogus commit' '
|
|
commit="$(git hash-object -t commit -w --stdin <bogus-commit)"
|
|
'
|
|
|
|
test_expect_success 'fsck with no skipList input' '
|
|
test_must_fail git fsck 2>err &&
|
|
test_i18ngrep "missingEmail" err
|
|
'
|
|
|
|
test_expect_success 'setup sorted and unsorted skipLists' '
|
|
cat >SKIP.unsorted <<-EOF &&
|
|
0000000000000000000000000000000000000004
|
|
0000000000000000000000000000000000000002
|
|
$commit
|
|
0000000000000000000000000000000000000001
|
|
0000000000000000000000000000000000000003
|
|
EOF
|
|
sort SKIP.unsorted >SKIP.sorted
|
|
'
|
|
|
|
test_expect_success 'fsck with sorted skipList' '
|
|
git -c fsck.skipList=SKIP.sorted fsck
|
|
'
|
|
|
|
test_expect_success 'fsck with unsorted skipList' '
|
|
git -c fsck.skipList=SKIP.unsorted fsck
|
|
'
|
|
|
|
test_expect_success 'fsck with invalid or bogus skipList input' '
|
|
git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
|
|
test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
|
|
test_i18ngrep "Could not open skip list: does-not-exist" err &&
|
|
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
|
|
test_i18ngrep "Invalid SHA-1: \[core\]" err
|
|
'
|
|
|
|
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
|
|
cat >SKIP.with-comment <<-EOF &&
|
|
# Some bad commit
|
|
0000000000000000000000000000000000000001
|
|
EOF
|
|
test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
|
|
test_i18ngrep "missingEmail" err-with-comment &&
|
|
cat >SKIP.with-empty-line <<-EOF &&
|
|
0000000000000000000000000000000000000001
|
|
|
|
0000000000000000000000000000000000000002
|
|
EOF
|
|
test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
|
|
test_i18ngrep "missingEmail" err-with-empty-line
|
|
'
|
|
|
|
test_expect_success 'fsck no garbage output from comments & empty lines errors' '
|
|
test_line_count = 1 err-with-comment &&
|
|
test_line_count = 1 err-with-empty-line
|
|
'
|
|
|
|
test_expect_success 'fsck with invalid abbreviated skipList input' '
|
|
echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
|
|
test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
|
|
test_i18ngrep "^fatal: Invalid SHA-1: " err-abbreviated
|
|
'
|
|
|
|
test_expect_success 'fsck with exhaustive accepted skipList input (various types of comments etc.)' '
|
|
>SKIP.exhaustive &&
|
|
echo "# A commented line" >>SKIP.exhaustive &&
|
|
echo "" >>SKIP.exhaustive &&
|
|
echo " " >>SKIP.exhaustive &&
|
|
echo " # Comment after whitespace" >>SKIP.exhaustive &&
|
|
echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
|
|
echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
|
|
echo " 0000000000000000000000000000000000000001" >>SKIP.exhaustive &&
|
|
git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
|
|
test_must_be_empty err
|
|
'
|
|
|
|
test_expect_success 'push with receive.fsck.skipList' '
|
|
git push . $commit:refs/heads/bogus &&
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config receive.fsckObjects true &&
|
|
test_must_fail git push --porcelain dst bogus &&
|
|
echo $commit >dst/.git/SKIP &&
|
|
|
|
# receive.fsck.* does not fall back on fsck.*
|
|
git --git-dir=dst/.git config fsck.skipList SKIP &&
|
|
test_must_fail git push --porcelain dst bogus &&
|
|
|
|
# Invalid and/or bogus skipList input
|
|
git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
|
|
test_must_fail git push --porcelain dst bogus &&
|
|
git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
|
|
test_must_fail git push --porcelain dst bogus 2>err &&
|
|
test_i18ngrep "Could not open skip list: does-not-exist" err &&
|
|
git --git-dir=dst/.git config receive.fsck.skipList config &&
|
|
test_must_fail git push --porcelain dst bogus 2>err &&
|
|
test_i18ngrep "Invalid SHA-1: \[core\]" err &&
|
|
|
|
git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
|
|
git push --porcelain dst bogus
|
|
'
|
|
|
|
test_expect_success 'fetch with fetch.fsck.skipList' '
|
|
refspec=refs/heads/bogus:refs/heads/bogus &&
|
|
git push . $commit:refs/heads/bogus &&
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config fetch.fsckObjects true &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
echo $commit >dst/.git/SKIP &&
|
|
|
|
# fetch.fsck.* does not fall back on fsck.*
|
|
git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
|
|
# Invalid and/or bogus skipList input
|
|
git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
|
|
test_i18ngrep "Could not open skip list: does-not-exist" err &&
|
|
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
|
|
test_i18ngrep "Invalid SHA-1: \[core\]" err &&
|
|
|
|
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
|
|
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
|
|
'
|
|
|
|
test_expect_success 'fsck.<unknownmsg-id> dies' '
|
|
test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
|
|
test_i18ngrep "Unhandled message id: whatever" err
|
|
'
|
|
|
|
test_expect_success 'push with receive.fsck.missingEmail=warn' '
|
|
git push . $commit:refs/heads/bogus &&
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config receive.fsckobjects true &&
|
|
test_must_fail git push --porcelain dst bogus &&
|
|
|
|
# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
|
|
git --git-dir=dst/.git config fsck.missingEmail warn &&
|
|
test_must_fail git push --porcelain dst bogus &&
|
|
|
|
# receive.fsck.<unknownmsg-id> warns
|
|
git --git-dir=dst/.git config \
|
|
receive.fsck.whatEver error &&
|
|
|
|
git --git-dir=dst/.git config \
|
|
receive.fsck.missingEmail warn &&
|
|
git push --porcelain dst bogus >act 2>&1 &&
|
|
grep "missingEmail" act &&
|
|
test_i18ngrep "Skipping unknown msg id.*whatever" act &&
|
|
git --git-dir=dst/.git branch -D bogus &&
|
|
git --git-dir=dst/.git config --add \
|
|
receive.fsck.missingEmail ignore &&
|
|
git push --porcelain dst bogus >act 2>&1 &&
|
|
! grep "missingEmail" act
|
|
'
|
|
|
|
test_expect_success 'fetch with fetch.fsck.missingEmail=warn' '
|
|
refspec=refs/heads/bogus:refs/heads/bogus &&
|
|
git push . $commit:refs/heads/bogus &&
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config fetch.fsckobjects true &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
|
|
# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
|
|
git --git-dir=dst/.git config fsck.missingEmail warn &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
|
|
|
# receive.fsck.<unknownmsg-id> warns
|
|
git --git-dir=dst/.git config \
|
|
fetch.fsck.whatEver error &&
|
|
|
|
git --git-dir=dst/.git config \
|
|
fetch.fsck.missingEmail warn &&
|
|
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
|
|
grep "missingEmail" act &&
|
|
test_i18ngrep "Skipping unknown msg id.*whatever" act &&
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config fetch.fsckobjects true &&
|
|
git --git-dir=dst/.git config \
|
|
fetch.fsck.missingEmail ignore &&
|
|
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
|
|
! grep "missingEmail" act
|
|
'
|
|
|
|
test_expect_success \
|
|
'receive.fsck.unterminatedHeader=warn triggers error' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config receive.fsckobjects true &&
|
|
git --git-dir=dst/.git config \
|
|
receive.fsck.unterminatedheader warn &&
|
|
test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
|
|
grep "Cannot demote unterminatedheader" act
|
|
'
|
|
|
|
test_expect_success \
|
|
'fetch.fsck.unterminatedHeader=warn triggers error' '
|
|
rm -rf dst &&
|
|
git init dst &&
|
|
git --git-dir=dst/.git config fetch.fsckobjects true &&
|
|
git --git-dir=dst/.git config \
|
|
fetch.fsck.unterminatedheader warn &&
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
|
|
grep "Cannot demote unterminatedheader" act
|
|
'
|
|
|
|
test_done
|