commit-graph: clarify missing-chunk error messages

When a required commit-graph chunk cannot be loaded, we leave its entry
in the struct NULL, and then later complain that it is missing. But
that's just one reason we might not have loaded it, as we also do some
data quality checks.

Let's switch these messages to say "missing or corrupted", which is
exactly what the midx code says for the same cases. Likewise, we'll use
the same phrasing and capitalization as those for consistency. And while
we're here, we can mark them for translation (just like the midx ones).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-graph.c b/commit-graph.c
index 87e594c42e4d16c4067423e4cc37e08a3c429b99..85450a93de602bd02811fbdc39887973e8ec99a3 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -292,15 +292,15 @@ static int verify_commit_graph_lite(struct commit_graph *g)
         * itself.
         */
        if (!g->chunk_oid_fanout) {
-               error("commit-graph is missing the OID Fanout chunk");
+               error(_("commit-graph required OID fanout chunk missing or corrupted"));
                return 1;
        }
        if (!g->chunk_oid_lookup) {
-               error("commit-graph is missing the OID Lookup chunk");
+               error(_("commit-graph required OID lookup chunk missing or corrupted"));
                return 1;
        }
        if (!g->chunk_commit_data) {
-               error("commit-graph is missing the Commit Data chunk");
+               error(_("commit-graph required commit data chunk missing or corrupted"));
                return 1;
        }
 

diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 6505ff595a389afa7d79fe31305d214046c376f2..4c4a4ae13e190232f6be35cf1baee53bf65bf41a 100755 (executable)
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -540,17 +540,17 @@ test_expect_success 'detect low chunk count' '
 
 test_expect_success 'detect missing OID fanout chunk' '
        corrupt_graph_and_verify $GRAPH_BYTE_OID_FANOUT_ID "\0" \
-               "missing the OID Fanout chunk"
+               "commit-graph required OID fanout chunk missing or corrupted"
 '
 
 test_expect_success 'detect missing OID lookup chunk' '
        corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ID "\0" \
-               "missing the OID Lookup chunk"
+               "commit-graph required OID lookup chunk missing or corrupted"
 '
 
 test_expect_success 'detect missing commit data chunk' '
        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATA_ID "\0" \
-               "missing the Commit Data chunk"
+               "commit-graph required commit data chunk missing or corrupted"
 '
 
 test_expect_success 'detect incorrect fanout' '
@@ -842,7 +842,7 @@ test_expect_success 'reader notices too-small oid fanout chunk' '
        check_corrupt_chunk OIDF clear $(printf "000000%02x" $(test_seq 250)) &&
        cat >expect.err <<-\EOF &&
        error: commit-graph oid fanout chunk is wrong size
-       error: commit-graph is missing the OID Fanout chunk
+       error: commit-graph required OID fanout chunk missing or corrupted
        EOF
        test_cmp expect.err err
 '
@@ -874,7 +874,7 @@ test_expect_success 'reader notices too-small commit data chunk' '
        check_corrupt_chunk CDAT clear 00000000 &&
        cat >expect.err <<-\EOF &&
        error: commit-graph commit data chunk is wrong size
-       error: commit-graph is missing the Commit Data chunk
+       error: commit-graph required commit data chunk missing or corrupted
        EOF
        test_cmp expect.err err
 '