tests: don't assume a .git/info for .git/info/grafts
Change those tests that assumed that a .git/info directory would be created for them when writing .git/info/grafts to explicitly create the directory. Do this using the new "TEST_CREATE_REPO_NO_TEMPLATE" facility, and use "mkdir" instead of "mkdir -p" to assert that we don't have the .git/info already. An exception to this is the "with grafts" test in "t6001-rev-list-graft.sh". There we're modifying our ".git" state in a for-loop, in lieu of refactoring that more extensively let's use "mkdir -p" there. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e942292a3e
commit
93e02b6e1e
@ -149,7 +149,7 @@ test_expect_success 'blame evil merge' '
|
||||
|
||||
test_expect_success 'blame huge graft' '
|
||||
test_when_finished "git checkout branch2" &&
|
||||
test_when_finished "rm -f .git/info/grafts" &&
|
||||
test_when_finished "rm -rf .git/info" &&
|
||||
graft= &&
|
||||
for i in 0 1 2
|
||||
do
|
||||
@ -164,6 +164,7 @@ test_expect_success 'blame huge graft' '
|
||||
graft="$graft$commit " || return 1
|
||||
done
|
||||
done &&
|
||||
mkdir .git/info &&
|
||||
printf "%s " $graft >.git/info/grafts &&
|
||||
check_count -h 00 01 1 10 1
|
||||
'
|
||||
|
@ -5,6 +5,7 @@ test_description='test git worktree add'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_CREATE_REPO_NO_TEMPLATE=1
|
||||
. ./test-lib.sh
|
||||
|
||||
. "$TEST_DIRECTORY"/lib-rebase.sh
|
||||
@ -229,6 +230,7 @@ test_expect_success 'checkout with grafts' '
|
||||
SHA1=$(git rev-parse HEAD) &&
|
||||
test_commit def &&
|
||||
test_commit xyz &&
|
||||
mkdir .git/info &&
|
||||
echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
|
||||
cat >expected <<-\EOF &&
|
||||
xyz
|
||||
@ -559,6 +561,8 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' '
|
||||
'
|
||||
|
||||
post_checkout_hook () {
|
||||
test_when_finished "rm -rf .git/hooks" &&
|
||||
mkdir .git/hooks &&
|
||||
test_hook -C "$1" post-checkout <<-\EOF
|
||||
{
|
||||
echo $*
|
||||
|
@ -361,13 +361,14 @@ test_expect_success 'replace-objects invalidates commit-graph' '
|
||||
test_expect_success 'commit grafts invalidate commit-graph' '
|
||||
cd "$TRASH_DIRECTORY" &&
|
||||
test_when_finished rm -rf graft &&
|
||||
git clone full graft &&
|
||||
git clone --template= full graft &&
|
||||
(
|
||||
cd graft &&
|
||||
git commit-graph write --reachable &&
|
||||
test_path_is_file .git/objects/info/commit-graph &&
|
||||
H1=$(git rev-parse --verify HEAD~1) &&
|
||||
H3=$(git rev-parse --verify HEAD~3) &&
|
||||
mkdir .git/info &&
|
||||
echo "$H1 $H3" >.git/info/grafts &&
|
||||
git -c core.commitGraph=false log >expect &&
|
||||
git -c core.commitGraph=true log >actual &&
|
||||
|
@ -99,6 +99,7 @@ do
|
||||
"
|
||||
|
||||
test_expect_success 'with grafts' "
|
||||
mkdir -p .git/info &&
|
||||
echo '$B0 $A2' >.git/info/grafts &&
|
||||
check $type $B2 -- $B2 $B1 $B0 $A2 $A1 $A0
|
||||
"
|
||||
|
@ -8,6 +8,7 @@ test_description='Test git rev-parse with different parent options'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_CREATE_REPO_NO_TEMPLATE=1
|
||||
. ./test-lib.sh
|
||||
|
||||
test_cmp_rev_output () {
|
||||
@ -25,6 +26,7 @@ test_expect_success 'setup' '
|
||||
git merge -m next --allow-unrelated-histories start2 &&
|
||||
test_commit final &&
|
||||
|
||||
mkdir .git/info &&
|
||||
test_seq 40 |
|
||||
while read i
|
||||
do
|
||||
|
@ -4,6 +4,7 @@ test_description='git annotate'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_CREATE_REPO_NO_TEMPLATE=1
|
||||
. ./test-lib.sh
|
||||
|
||||
PROG='git annotate'
|
||||
|
@ -4,6 +4,7 @@ test_description='git blame'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_CREATE_REPO_NO_TEMPLATE=1
|
||||
. ./test-lib.sh
|
||||
|
||||
PROG='git blame -c'
|
||||
|
@ -4,6 +4,7 @@ test_description='colored git blame'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_CREATE_REPO_NO_TEMPLATE=1
|
||||
. ./test-lib.sh
|
||||
|
||||
PROG='git blame -c'
|
||||
|
Loading…
Reference in New Issue
Block a user