fsck: report invalid object type-path combinations

[thirdparty/git.git] / t / t1450-fsck.sh

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index faf0e98847b7b6159d0c9448043830f9eb43babd..6337236fd8226b1902f11ebf54ff9e6d02f537e2 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -54,6 +54,7 @@ test_expect_success 'object with hash mismatch' '
                cd hash-mismatch &&
 
                oid=$(echo blob | git hash-object -w --stdin) &&
+               oldoid=$oid &&
                old=$(test_oid_to_path "$oid") &&
                new=$(dirname $old)/$(test_oid ff_2) &&
                oid="$(dirname $new)$(basename $new)" &&
@@ -65,7 +66,7 @@ test_expect_success 'object with hash mismatch' '
                git update-ref refs/heads/bogus $cmt &&
 
                test_must_fail git fsck 2>out &&
-               grep "$oid.*corrupt" out
+               grep "$oldoid: hash-path mismatch, found at: .*$new" out
        )
 '
 
@@ -75,6 +76,7 @@ test_expect_success 'object with hash and type mismatch' '
                cd hash-type-mismatch &&
 
                oid=$(echo blob | git hash-object -w --stdin -t garbage --literally) &&
+               oldoid=$oid &&
                old=$(test_oid_to_path "$oid") &&
                new=$(dirname $old)/$(test_oid ff_2) &&
                oid="$(dirname $new)$(basename $new)" &&
@@ -87,8 +89,8 @@ test_expect_success 'object with hash and type mismatch' '
 
 
                test_must_fail git fsck 2>out &&
-               grep "^error: hash mismatch for " out &&
-               grep "^error: $oid: object is of unknown type '"'"'garbage'"'"'" out
+               grep "^error: $oldoid: hash-path mismatch, found at: .*$new" out &&
+               grep "^error: $oldoid: object is of unknown type '"'"'garbage'"'"'" out
        )
 '