From: Derrick Stolee <dsto...@microsoft.com>
There are a few tests that already require GIT_TEST_COMMIT_GRAPH=0
as they rely on an interaction with the commits in the object store
that is circumvented by parsing commit information from the
commit-graph instead. Before enabling core.commitGraph as true by
default, explicitly turn the setting off for these tests.
Signed-off-by: Derrick Stolee <dsto...@microsoft.com>
---
t/t0410-partial-clone.sh | 3 ++-
t/t5307-pack-missing-commit.sh | 3 ++-
t/t6011-rev-list-with-bad-commit.sh | 3 ++-
t/t6024-recursive-merge.sh | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index cfd0655ea1..f5277fafb1 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -193,7 +193,8 @@ test_expect_success 'rev-list stops traversal at missing
and promised commit' '
git -C repo config core.repositoryformatversion 1 &&
git -C repo config extensions.partialclone "arbitrary string" &&
- GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects
--objects bar >out &&
+ GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false \
+ -C repo rev-list --exclude-promisor-objects --objects bar >out
&&
grep $(git -C repo rev-parse bar) out &&
! grep $FOO out
'
diff --git a/t/t5307-pack-missing-commit.sh b/t/t5307-pack-missing-commit.sh
index dacb440b27..dc4c19d0aa 100755
--- a/t/t5307-pack-missing-commit.sh
+++ b/t/t5307-pack-missing-commit.sh
@@ -16,7 +16,8 @@ test_expect_success setup '
obj=$(git rev-parse --verify tag3) &&
fanout=$(expr "$obj" : "\(..\)") &&
remainder=$(expr "$obj" : "..\(.*\)") &&
- rm -f ".git/objects/$fanout/$remainder"
+ rm -f ".git/objects/$fanout/$remainder" &&
+ git config core.commitGraph false
'
test_expect_success 'check corruption' '
diff --git a/t/t6011-rev-list-with-bad-commit.sh
b/t/t6011-rev-list-with-bad-commit.sh
index 545b461e51..da6949743d 100755
--- a/t/t6011-rev-list-with-bad-commit.sh
+++ b/t/t6011-rev-list-with-bad-commit.sh
@@ -42,7 +42,8 @@ test_expect_success 'corrupt second commit object' \
'
test_expect_success 'rev-list should fail' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all >
/dev/null
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 \
+ git -c core.commitGraph=false rev-list --all > /dev/null
'
test_expect_success 'git repack _MUST_ fail' \
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 27c7de90ce..fccdf96f13 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -61,7 +61,8 @@ GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
'
test_expect_success 'combined merge conflicts' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 \
+ git -c core.commitGraph=false merge -m final G
'
cat > expect << EOF
--
gitgitgadget
