2011-09-05 01:19:36 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='fetch/receive strict mode'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2018-07-27 14:37:16 +00:00
|
|
|
test_expect_success 'setup and inject "corrupt or missing" object' '
|
2011-09-05 01:19:36 +00:00
|
|
|
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|^..|&/|") &&
|
2018-07-27 14:37:16 +00:00
|
|
|
echo $S >S &&
|
|
|
|
echo $X >X &&
|
|
|
|
cp .git/objects/$S .git/objects/$S.back &&
|
2011-09-05 01:19:36 +00:00
|
|
|
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 &&
|
2011-10-05 19:36:20 +00:00
|
|
|
test_must_fail git fetch ../.git master
|
2011-09-05 01:19:36 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
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 &&
|
2011-10-05 19:36:20 +00:00
|
|
|
test_must_fail git fetch ../.git master
|
2011-09-05 01:19:36 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
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
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-02-13 20:17:12 +00:00
|
|
|
cat >exp <<EOF
|
|
|
|
To dst
|
|
|
|
! refs/heads/master:refs/heads/test [remote rejected] (missing necessary objects)
|
|
|
|
EOF
|
|
|
|
|
2011-09-05 01:19:36 +00:00
|
|
|
test_expect_success 'push without strict' '
|
|
|
|
rm -rf dst &&
|
|
|
|
git init dst &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
git config fetch.fsckobjects false &&
|
|
|
|
git config transfer.fsckobjects false
|
|
|
|
) &&
|
2012-02-13 20:17:12 +00:00
|
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
|
|
test_cmp exp act
|
2011-09-05 01:19:36 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
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
|
|
|
|
) &&
|
2012-02-13 20:17:12 +00:00
|
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
|
|
test_cmp exp act
|
2011-09-05 01:19:36 +00:00
|
|
|
'
|
|
|
|
|
2012-02-13 20:17:12 +00:00
|
|
|
cat >exp <<EOF
|
|
|
|
To dst
|
2012-09-21 05:38:46 +00:00
|
|
|
! refs/heads/master:refs/heads/test [remote rejected] (unpacker error)
|
2012-02-13 20:17:12 +00:00
|
|
|
EOF
|
|
|
|
|
2011-09-05 01:19:36 +00:00
|
|
|
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
|
|
|
|
) &&
|
2016-04-19 22:51:25 +00:00
|
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
|
|
test_cmp exp act
|
2011-09-05 01:19:36 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with transfer.fsckobjects' '
|
|
|
|
rm -rf dst &&
|
|
|
|
git init dst &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
git config transfer.fsckobjects true
|
|
|
|
) &&
|
2016-04-19 22:51:25 +00:00
|
|
|
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
|
|
|
|
test_cmp exp act
|
2011-09-05 01:19:36 +00:00
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:16 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2016-07-16 05:06:24 +00:00
|
|
|
cat >bogus-commit <<EOF
|
|
|
|
tree $EMPTY_TREE
|
2015-06-22 15:26:36 +00:00
|
|
|
author Bugs Bunny 1234567890 +0000
|
|
|
|
committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
|
|
|
|
|
|
|
|
This commit object intentionally broken
|
|
|
|
EOF
|
|
|
|
|
2018-09-03 14:49:19 +00:00
|
|
|
test_expect_success 'setup bogus commit' '
|
|
|
|
commit="$(git hash-object -t commit -w --stdin <bogus-commit)"
|
|
|
|
'
|
|
|
|
|
2018-09-03 14:49:20 +00:00
|
|
|
test_expect_success 'fsck with no skipList input' '
|
|
|
|
test_must_fail git fsck 2>err &&
|
|
|
|
test_i18ngrep "missingEmail" err
|
|
|
|
'
|
|
|
|
|
fsck: document and test sorted skipList input
Ever since the skipList support was first added in cd94c6f91 ("fsck:
git receive-pack: support excluding objects from fsck'ing",
2015-06-22) the documentation for the format has that the file is a
sorted list of object names.
Thus, anyone using the feature would have thought the list needed to
be sorted. E.g. I recently in conjunction with my fetch.fsck.*
implementation in 1362df0d41 ("fetch: implement fetch.fsck.*",
2018-07-27) wrote some code to ship a skipList, and went out of my way
to sort it.
Doing so seems intuitive, since it contains fixed-width records, and
has no support for comments, so one might expect it to be binary
searched in-place on-disk.
However, as documented here this was never a requirement, so let's
change the documentation. Since this is a file format change let's
also document what was said about this in the past, so e.g. someone
like myself reading the new docs can see this never needed to be
sorted ("why do I have all this code to sort this thing...").
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-09-03 14:49:21 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:19 +00:00
|
|
|
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 &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "could not open.*: does-not-exist" err &&
|
2018-07-27 14:37:19 +00:00
|
|
|
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "invalid object name: \[core\]" err
|
2018-07-27 14:37:19 +00:00
|
|
|
'
|
|
|
|
|
2018-09-03 14:49:28 +00:00
|
|
|
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
|
2018-09-03 14:49:22 +00:00
|
|
|
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 &&
|
2018-09-03 14:49:28 +00:00
|
|
|
test_i18ngrep "missingEmail" err-with-comment &&
|
2018-09-03 14:49:22 +00:00
|
|
|
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 &&
|
2018-09-03 14:49:28 +00:00
|
|
|
test_i18ngrep "missingEmail" err-with-empty-line
|
2018-09-03 14:49:22 +00:00
|
|
|
'
|
|
|
|
|
2018-09-03 14:49:26 +00:00
|
|
|
test_expect_success 'fsck no garbage output from comments & empty lines errors' '
|
2018-09-03 14:49:22 +00:00
|
|
|
test_line_count = 1 err-with-comment &&
|
|
|
|
test_line_count = 1 err-with-empty-line
|
|
|
|
'
|
|
|
|
|
2018-09-03 14:49:23 +00:00
|
|
|
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 &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "^fatal: invalid object name: " err-abbreviated
|
2018-09-03 14:49:23 +00:00
|
|
|
'
|
|
|
|
|
2018-09-03 14:49:28 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2015-06-22 15:27:18 +00:00
|
|
|
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 &&
|
2018-07-27 14:37:18 +00:00
|
|
|
|
|
|
|
# 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 &&
|
|
|
|
|
2018-07-27 14:37:19 +00:00
|
|
|
# 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 &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "could not open.*: does-not-exist" err &&
|
2018-07-27 14:37:19 +00:00
|
|
|
git --git-dir=dst/.git config receive.fsck.skipList config &&
|
|
|
|
test_must_fail git push --porcelain dst bogus 2>err &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "invalid object name: \[core\]" err &&
|
2018-07-27 14:37:19 +00:00
|
|
|
|
2018-07-27 14:37:18 +00:00
|
|
|
git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
|
2015-06-22 15:27:18 +00:00
|
|
|
git push --porcelain dst bogus
|
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:17 +00:00
|
|
|
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 &&
|
2018-07-27 14:37:18 +00:00
|
|
|
git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
|
|
|
|
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
|
2018-07-27 14:37:17 +00:00
|
|
|
echo $commit >dst/.git/SKIP &&
|
2018-07-27 14:37:18 +00:00
|
|
|
|
|
|
|
# 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 &&
|
|
|
|
|
2018-07-27 14:37:19 +00:00
|
|
|
# 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 &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "could not open.*: does-not-exist" err &&
|
2018-07-27 14:37:19 +00:00
|
|
|
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 &&
|
2019-05-15 21:44:56 +00:00
|
|
|
test_i18ngrep "invalid object name: \[core\]" err &&
|
2018-07-27 14:37:19 +00:00
|
|
|
|
2018-07-27 14:37:18 +00:00
|
|
|
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
|
2018-07-27 14:37:17 +00:00
|
|
|
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
|
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:20 +00:00
|
|
|
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
|
|
|
|
'
|
2018-07-27 14:37:17 +00:00
|
|
|
|
2015-06-22 15:26:36 +00:00
|
|
|
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 &&
|
2018-07-27 14:37:18 +00:00
|
|
|
|
|
|
|
# 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 &&
|
|
|
|
|
2018-07-27 14:37:20 +00:00
|
|
|
# receive.fsck.<unknownmsg-id> warns
|
|
|
|
git --git-dir=dst/.git config \
|
|
|
|
receive.fsck.whatEver error &&
|
|
|
|
|
2015-06-22 15:26:36 +00:00
|
|
|
git --git-dir=dst/.git config \
|
|
|
|
receive.fsck.missingEmail warn &&
|
|
|
|
git push --porcelain dst bogus >act 2>&1 &&
|
2015-06-22 15:26:48 +00:00
|
|
|
grep "missingEmail" act &&
|
2018-07-27 14:37:20 +00:00
|
|
|
test_i18ngrep "Skipping unknown msg id.*whatever" act &&
|
2015-06-22 15:26:48 +00:00
|
|
|
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 &&
|
2017-01-03 19:57:07 +00:00
|
|
|
! grep "missingEmail" act
|
2015-06-22 15:26:36 +00:00
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:17 +00:00
|
|
|
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 &&
|
2018-07-27 14:37:18 +00:00
|
|
|
|
|
|
|
# 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 &&
|
|
|
|
|
2018-07-27 14:37:20 +00:00
|
|
|
# receive.fsck.<unknownmsg-id> warns
|
|
|
|
git --git-dir=dst/.git config \
|
|
|
|
fetch.fsck.whatEver error &&
|
|
|
|
|
2018-07-27 14:37:17 +00:00
|
|
|
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 &&
|
2018-07-27 14:37:20 +00:00
|
|
|
test_i18ngrep "Skipping unknown msg id.*whatever" act &&
|
2018-07-27 14:37:17 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2015-06-22 15:26:42 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2018-07-27 14:37:17 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2011-09-05 01:19:36 +00:00
|
|
|
test_done
|