When operating on a stream of commit OIDs on stdin, 'git commit-graph
write' checks that each OID refers to an object that is indeed a commit.
This is convenient to make sure that the given input is well-formed, but
can sometimes be undesirable.
For example, server operators may wish to feed the refnames that were
updated during a push to 'git commit-graph write --input=stdin-commits',
and silently discard refs that don't point at commits. This can be done
by combing the output of 'git for-each-ref' with '--format
%(*objecttype)', but this requires opening up a potentially large number
of objects. Instead, it is more convenient to feed the updated refs to
the commit-graph machinery, and let it throw out refs that don't point
to commits.
Introduce '--[no-]check-oids' to make such a behavior possible. With
'--check-oids' (the default behavior to retain backwards compatibility),
'git commit-graph write' will barf on a non-commit line in its input.
With 'no-check-oids', such lines will be silently ignored, making the
above possible by specifying this option.
No matter which is supplied, 'git commit-graph write' retains the
behavior from the previous commit of rejecting non-OID inputs like
"HEAD" and "refs/heads/foo" as before.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committedApr 14, 2020 at 22:31 UTC7a9ce0269bc0f4ef230f930b3910b70ac3142552
4 files changed+42-4
Documentation/git-commit-graph.txt
+5
index 46f7f7c573..91e8027b86 100644--- a/Documentation/git-commit-graph.txt+++ b/Documentation/git-commit-graph.txt@@ -82,6 +82,11 @@ tip with the previous tip. Finally, if `--expire-time=<datetime>` is not specified, let `datetime` be the current time. After writing the split commit-graph, delete all unused commit-graph whose modified times are older than `datetime`.+++The `--[no-]check-oids` option decides whether or not OIDs are required+to be commits. By default, `--check-oids` is implied, generating an+error on non-commit objects. If `--no-check-oids` is given, non-commits+are silently discarded. 'verify'::
index bf86e4a92b..af677fc98e 100644--- a/commit-graph.c+++ b/commit-graph.c@@ -145,7 +145,7 @@ static int verify_commit_graph_lite(struct commit_graph *g) * * There should only be very basic checks here to ensure that * we don't e.g. segfault in fill_commit_in_graph(), but- * because this is a very hot codepath nothing that e.g. loops+ e because this is a very hot codepath nothing that e.g. loops * over g->num_commits, or runs a checksum on the commit-graph * itself. */
t/t5318-commit-graph.sh
+28
index 69599cea7f..23c7b7e036 100755--- a/t/t5318-commit-graph.sh+++ b/t/t5318-commit-graph.sh@@ -49,6 +49,34 @@ 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