Merge branch 'tr/maint-word-diff-incomplete-line'

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

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 1be415e334330b2fea398cc58a0f054b6b876da1..523ce9c45b75d85a129015a56004473a5fccf926 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -61,7 +61,7 @@ test_expect_success 'object with bad sha1' '
        sha=$(echo blob | git hash-object -w --stdin) &&
        old=$(echo $sha | sed "s+^..+&/+") &&
        new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
-       sha="$(dirname $new)$(basename $new)"
+       sha="$(dirname $new)$(basename $new)" &&
        mv .git/objects/$old .git/objects/$new &&
        test_when_finished "remove_object $sha" &&
        git update-index --add --cacheinfo 100644 $sha foo &&
@@ -110,8 +110,44 @@ test_expect_success 'email with embedded > is not okay' '
        grep "error in commit $new" out
 '
 
+test_expect_success 'missing < email delimiter is reported nicely' '
+       git cat-file commit HEAD >basis &&
+       sed "s/<//" basis >bad-email-2 &&
+       new=$(git hash-object -t commit -w --stdin <bad-email-2) &&
+       test_when_finished "remove_object $new" &&
+       git update-ref refs/heads/bogus "$new" &&
+       test_when_finished "git update-ref -d refs/heads/bogus" &&
+       git fsck 2>out &&
+       cat out &&
+       grep "error in commit $new.* - bad name" out
+'
+
+test_expect_success 'missing email is reported nicely' '
+       git cat-file commit HEAD >basis &&
+       sed "s/[a-z]* <[^>]*>//" basis >bad-email-3 &&
+       new=$(git hash-object -t commit -w --stdin <bad-email-3) &&
+       test_when_finished "remove_object $new" &&
+       git update-ref refs/heads/bogus "$new" &&
+       test_when_finished "git update-ref -d refs/heads/bogus" &&
+       git fsck 2>out &&
+       cat out &&
+       grep "error in commit $new.* - missing email" out
+'
+
+test_expect_success '> in name is reported' '
+       git cat-file commit HEAD >basis &&
+       sed "s/ </> </" basis >bad-email-4 &&
+       new=$(git hash-object -t commit -w --stdin <bad-email-4) &&
+       test_when_finished "remove_object $new" &&
+       git update-ref refs/heads/bogus "$new" &&
+       test_when_finished "git update-ref -d refs/heads/bogus" &&
+       git fsck 2>out &&
+       cat out &&
+       grep "error in commit $new" out
+'
+
 test_expect_success 'tag pointing to nonexistent' '
-       cat >invalid-tag <<-\EOF
+       cat >invalid-tag <<-\EOF &&
        object ffffffffffffffffffffffffffffffffffffffff
        type commit
        tag invalid