summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 19:44:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-29 19:44:40 (GMT)
commitdbd5e0a1861c5bb1446e5518173aa1760c6617b0 (patch)
tree1cf8125fb2e1d96f34115fee5aebae075a7ab414 /t
parent7a9ce0269bc0f4ef230f930b3910b70ac3142552 (diff)
downloadgit-dbd5e0a1861c5bb1446e5518173aa1760c6617b0.zip
git-dbd5e0a1861c5bb1446e5518173aa1760c6617b0.tar.gz
git-dbd5e0a1861c5bb1446e5518173aa1760c6617b0.tar.bz2
Revert "commit-graph.c: introduce '--[no-]check-oids'"
This reverts commit 7a9ce0269bc0f4ef230f930b3910b70ac3142552, which has not yet gained consensus.
Diffstat (limited to 't')
-rwxr-xr-xt/t5318-commit-graph.sh28
1 files changed, 0 insertions, 28 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 23c7b7e..69599ce 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -49,34 +49,6 @@ test_expect_success 'exit with correct error on bad input to --stdin-commits' '
test_i18ngrep "invalid commit object id" stderr
'
-graph_expect_commits() {
- test-tool read-graph >got
- if ! grep "num_commits: $1" got
- then
- echo "graph_expect_commits: expected $1 commit(s), got:"
- cat got
- false
- fi
-}
-
-test_expect_success 'ignores non-commit OIDs to --input=stdin-commits with --no-check-oids' '
- test_when_finished rm -rf "$objdir/info/commit-graph" &&
- cd "$TRASH_DIRECTORY/full" &&
- # write a graph to ensure layers are/are not added appropriately
- git rev-parse HEAD~1 >base &&
- git commit-graph write --stdin-commits <base &&
- graph_expect_commits 2 &&
- # bad input is rejected
- echo HEAD >bad &&
- test_expect_code 1 git commit-graph write --stdin-commits <bad 2>err &&
- test_i18ngrep "unexpected non-hex object ID: HEAD" err &&
- graph_expect_commits 2 &&
- # update with valid commit OID, ignore tree OID
- git rev-parse HEAD HEAD^{tree} >in &&
- git commit-graph write --stdin-commits --no-check-oids <in &&
- graph_expect_commits 3
-'
-
graph_git_two_modes() {
git -c core.commitGraph=true $1 >output
git -c core.commitGraph=false $1 >expect