Merge branch 'jk/chunk-bounds-more'

[thirdparty/git.git] / t / t5318-commit-graph.sh

diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 134239d40f05fb15ef14712ee426b2fb581c827d..7fe7c72a87d3c3310c0ea278d0652ee45474efe7 100755 (executable)
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -48,7 +48,7 @@ test_expect_success 'exit with correct error on bad input to --stdin-packs' '
        echo doesnotexist >in &&
        test_expect_code 1 git -C full commit-graph write --stdin-packs \
                <in 2>stderr &&
-       test_i18ngrep "error adding pack" stderr
+       test_grep "error adding pack" stderr
 '
 
 test_expect_success 'create commits and repack' '
@@ -68,11 +68,11 @@ test_expect_success 'exit with correct error on bad input to --stdin-commits' '
        # invalid, non-hex OID
        echo HEAD | test_expect_code 1 git -C full commit-graph write \
                --stdin-commits 2>stderr &&
-       test_i18ngrep "unexpected non-hex object ID: HEAD" stderr &&
+       test_grep "unexpected non-hex object ID: HEAD" stderr &&
        # non-existent OID
        echo $ZERO_OID | test_expect_code 1 git -C full commit-graph write \
                --stdin-commits 2>stderr &&
-       test_i18ngrep "invalid object" stderr &&
+       test_grep "invalid object" stderr &&
        # valid commit and tree OID
        git -C full rev-parse HEAD HEAD^{tree} >in &&
        git -C full commit-graph write --stdin-commits <in &&
@@ -144,7 +144,7 @@ test_expect_success 'commit-graph write --stdin-commits force progress on for st
        git -C full rev-parse commits/5 >in &&
        GIT_PROGRESS_DELAY=0 git -C full commit-graph write --stdin-commits \
                --progress <in 2>err &&
-       test_i18ngrep "Collecting commits from input" err
+       test_grep "Collecting commits from input" err
 '
 
 test_expect_success 'commit-graph write --stdin-commits with the --no-progress option' '
@@ -384,13 +384,13 @@ test_expect_success 'warn on improper hash version' '
                cd sha1 &&
                mv ../cg-sha256 .git/objects/info/commit-graph &&
                git log -1 2>err &&
-               test_i18ngrep "commit-graph hash version 2 does not match version 1" err
+               test_grep "commit-graph hash version 2 does not match version 1" err
        ) &&
        (
                cd sha256 &&
                mv ../cg-sha1 .git/objects/info/commit-graph &&
                git log -1 2>err &&
-               test_i18ngrep "commit-graph hash version 1 does not match version 2" err
+               test_grep "commit-graph hash version 1 does not match version 2" err
        )
 '
 
@@ -475,7 +475,7 @@ corrupt_graph_verify() {
        grepstr=$1
        test_must_fail git -C full commit-graph verify 2>test_err &&
        grep -v "^+" test_err >err &&
-       test_i18ngrep "$grepstr" err &&
+       test_grep "$grepstr" err &&
        if test "$2" != "no-copy"
        then
                cp full/$objdir/info/commit-graph commit-graph-pre-write-test
@@ -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' '
@@ -560,7 +560,7 @@ test_expect_success 'detect incorrect fanout' '
 
 test_expect_success 'detect incorrect fanout final value' '
        corrupt_graph_and_verify $GRAPH_BYTE_FANOUT2 "\01" \
-               "oid table and fanout disagree on size"
+               "OID lookup chunk is the wrong size"
 '
 
 test_expect_success 'detect incorrect OID order' '
@@ -721,7 +721,7 @@ test_expect_success 'corrupt commit-graph write (broken parent)' '
                git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
                test_must_fail git commit-graph write --stdin-commits \
                        <good 2>test_err &&
-               test_i18ngrep "unable to parse commit" test_err
+               test_grep "unable to parse commit" test_err
        )
 '
 
@@ -742,7 +742,7 @@ test_expect_success 'corrupt commit-graph write (missing tree)' '
                git commit-tree -p "$broken" -m "good" "$tree" >good &&
                test_must_fail git commit-graph write --stdin-commits \
                        <good 2>test_err &&
-               test_i18ngrep "unable to parse commit" test_err
+               test_grep "unable to parse commit" test_err
        )
 '
 
@@ -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
 '
@@ -850,7 +850,8 @@ test_expect_success 'reader notices too-small oid fanout chunk' '
 test_expect_success 'reader notices fanout/lookup table mismatch' '
        check_corrupt_chunk OIDF 1020 "FFFFFFFF" &&
        cat >expect.err <<-\EOF &&
-       error: commit-graph oid table and fanout disagree on size
+       error: commit-graph OID lookup chunk is the wrong size
+       error: commit-graph required OID lookup chunk missing or corrupted
        EOF
        test_cmp expect.err err
 '
@@ -866,6 +867,7 @@ test_expect_success 'reader notices out-of-bounds fanout' '
        check_corrupt_chunk OIDF 0 $(printf "%02x000000" $(test_seq 0 254)) &&
        cat >expect.err <<-\EOF &&
        error: commit-graph fanout values out of order
+       error: commit-graph required OID fanout chunk missing or corrupted
        EOF
        test_cmp expect.err err
 '
@@ -874,7 +876,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
 '