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>
138 lines
2.1 KiB
Bash
Executable File
138 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
#
|
|
|
|
test_description='Test commit notes index (expensive!)'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
create_repo () {
|
|
number_of_commits=$1
|
|
nr=0
|
|
test -d .git || {
|
|
git init &&
|
|
(
|
|
while test $nr -lt $number_of_commits
|
|
do
|
|
nr=$(($nr+1))
|
|
mark=$(($nr+$nr))
|
|
notemark=$(($mark+1))
|
|
test_tick &&
|
|
cat <<-INPUT_END &&
|
|
commit refs/heads/master
|
|
mark :$mark
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
data <<COMMIT
|
|
commit #$nr
|
|
COMMIT
|
|
|
|
M 644 inline file
|
|
data <<EOF
|
|
file in commit #$nr
|
|
EOF
|
|
|
|
blob
|
|
mark :$notemark
|
|
data <<EOF
|
|
note for commit #$nr
|
|
EOF
|
|
|
|
INPUT_END
|
|
echo "N :$notemark :$mark" >>note_commit
|
|
done &&
|
|
test_tick &&
|
|
cat <<-INPUT_END &&
|
|
commit refs/notes/commits
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
data <<COMMIT
|
|
notes
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
cat note_commit
|
|
) |
|
|
git fast-import --quiet &&
|
|
git config core.notesRef refs/notes/commits
|
|
}
|
|
}
|
|
|
|
test_notes () {
|
|
count=$1 &&
|
|
git config core.notesRef refs/notes/commits &&
|
|
git log | grep "^ " >output &&
|
|
i=$count &&
|
|
while test $i -gt 0
|
|
do
|
|
echo " commit #$i" &&
|
|
echo " note for commit #$i" &&
|
|
i=$(($i-1))
|
|
done >expect &&
|
|
test_cmp expect output
|
|
}
|
|
|
|
write_script time_notes <<\EOF
|
|
mode=$1
|
|
i=1
|
|
while test $i -lt $2
|
|
do
|
|
case $1 in
|
|
no-notes)
|
|
GIT_NOTES_REF=non-existing
|
|
export GIT_NOTES_REF
|
|
;;
|
|
notes)
|
|
unset GIT_NOTES_REF
|
|
;;
|
|
esac
|
|
git log
|
|
i=$(($i+1))
|
|
done >/dev/null
|
|
EOF
|
|
|
|
time_notes () {
|
|
for mode in no-notes notes
|
|
do
|
|
echo $mode
|
|
/usr/bin/time ../time_notes $mode $1
|
|
done
|
|
}
|
|
|
|
do_tests () {
|
|
count=$1 pr=${2-}
|
|
|
|
test_expect_success $pr "setup $count" '
|
|
mkdir "$count" &&
|
|
(
|
|
cd "$count" &&
|
|
create_repo "$count"
|
|
)
|
|
'
|
|
|
|
test_expect_success $pr 'notes work' '
|
|
(
|
|
cd "$count" &&
|
|
test_notes "$count"
|
|
)
|
|
'
|
|
|
|
test_expect_success "USR_BIN_TIME${pr:+,$pr}" 'notes timing with /usr/bin/time' '
|
|
(
|
|
cd "$count" &&
|
|
time_notes 100
|
|
)
|
|
'
|
|
}
|
|
|
|
do_tests 10
|
|
for count in 100 1000 10000
|
|
do
|
|
do_tests "$count" EXPENSIVE
|
|
done
|
|
|
|
test_done
|