334afbc76f
In addition to the manual adjustment to let the `linux-gcc` CI job run the test suite with `master` and then with `main`, this patch makes sure that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts that currently rely on the initial branch name being `master by default. To determine which test scripts to mark up, the first step was to force-set the default branch name to `master` in - all test scripts that contain the keyword `master`, - t4211, which expects `t/t4211/history.export` with a hard-coded ref to initialize the default branch, - t5560 because it sources `t/t556x_common` which uses `master`, - t8002 and t8012 because both source `t/annotate-tests.sh` which also uses `master`) This trick was performed by this command: $ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\ ' $(git grep -l master t/t[0-9]*.sh) \ t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh After that, careful, manual inspection revealed that some of the test scripts containing the needle `master` do not actually rely on a specific default branch name: either they mention `master` only in a comment, or they initialize that branch specificially, or they do not actually refer to the current default branch. Therefore, the aforementioned modification was undone in those test scripts thusly: $ git checkout HEAD -- \ t/t0027-auto-crlf.sh t/t0060-path-utils.sh \ t/t1011-read-tree-sparse-checkout.sh \ t/t1305-config-include.sh t/t1309-early-config.sh \ t/t1402-check-ref-format.sh t/t1450-fsck.sh \ t/t2024-checkout-dwim.sh \ t/t2106-update-index-assume-unchanged.sh \ t/t3040-subprojects-basic.sh t/t3301-notes.sh \ t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \ t/t3436-rebase-more-options.sh \ t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \ t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \ t/t5511-refspec.sh t/t5526-fetch-submodules.sh \ t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \ t/t5548-push-porcelain.sh \ t/t5552-skipping-fetch-negotiator.sh \ t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \ t/t5614-clone-submodules-shallow.sh \ t/t7508-status.sh t/t7606-merge-custom.sh \ t/t9302-fast-import-unpack-limit.sh We excluded one set of test scripts in these commands, though: the range of `git p4` tests. The reason? `git p4` stores the (foreign) remote branch in the branch called `p4/master`, which is obviously not the default branch. Manual analysis revealed that only five of these tests actually require a specific default branch name to pass; They were modified thusly: $ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\ ' t/t980[0167]*.sh t/t9811*.sh Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
356 lines
11 KiB
Bash
Executable File
356 lines
11 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='fetch/receive strict mode'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./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)
|
|
Done
|
|
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 &&
|
|
$(test_oid 004)
|
|
$(test_oid 002)
|
|
$commit
|
|
$(test_oid 001)
|
|
$(test_oid 003)
|
|
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.*: does-not-exist" err &&
|
|
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
|
|
test_i18ngrep "invalid object name: \[core\]" err
|
|
'
|
|
|
|
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
|
|
cat >SKIP.with-comment <<-EOF &&
|
|
# Some bad commit
|
|
$(test_oid 001)
|
|
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 &&
|
|
$(test_oid 001)
|
|
|
|
$(test_oid 002)
|
|
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 object name: " 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 " $(test_oid 001)" >>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.*: 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 object name: \[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.*: 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 object name: \[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
|