Merge branch 'kw/rebase-progress' into next

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 33a51c9a67fe833e31e51099f7568b64be385d07..4087150db1b787540abc5a5f648839efbe4d78e3 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -573,7 +573,7 @@ test_expect_success 'fsck --name-objects' '
                remove_object $(git rev-parse julius:caesar.t) &&
                test_must_fail git fsck --name-objects >out &&
                tree=$(git rev-parse --verify julius:) &&
-               grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out
+               egrep "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out
        )
 '
 
@@ -608,6 +608,22 @@ test_expect_success 'fsck errors in packed objects' '
        ! grep corrupt out
 '
 
+test_expect_success 'fsck fails on corrupt packfile' '
+       hsh=$(git commit-tree -m mycommit HEAD^{tree}) &&
+       pack=$(echo $hsh | git pack-objects .git/objects/pack/pack) &&
+
+       # Corrupt the first byte of the first object. (It contains 3 type bits,
+       # at least one of which is not zero, so setting the first byte to 0 is
+       # sufficient.)
+       chmod a+w .git/objects/pack/pack-$pack.pack &&
+       printf '\0' | dd of=.git/objects/pack/pack-$pack.pack bs=1 conv=notrunc seek=12 &&
+
+       test_when_finished "rm -f .git/objects/pack/pack-$pack.*" &&
+       remove_object $hsh &&
+       test_must_fail git fsck 2>out &&
+       test_i18ngrep "checksum mismatch" out
+'
+
 test_expect_success 'fsck finds problems in duplicate loose objects' '
        rm -rf broken-duplicate &&
        git init broken-duplicate &&
@@ -689,4 +705,35 @@ test_expect_success 'bogus head does not fallback to all heads' '
        ! grep $blob out
 '
 
+# Corrupt the checksum on the index.
+# Add 1 to the last byte in the SHA.
+corrupt_index_checksum () {
+    perl -w -e '
+       use Fcntl ":seek";
+       open my $fh, "+<", ".git/index" or die "open: $!";
+       binmode $fh;
+       seek $fh, -1, SEEK_END or die "seek: $!";
+       read $fh, my $in_byte, 1 or die "read: $!";
+
+       $in_value = unpack("C", $in_byte);
+       $out_value = ($in_value + 1) & 255;
+
+       $out_byte = pack("C", $out_value);
+
+       seek $fh, -1, SEEK_END or die "seek: $!";
+       print $fh $out_byte;
+       close $fh or die "close: $!";
+    '
+}
+
+# Corrupt the checksum on the index and then
+# verify that only fsck notices.
+test_expect_success 'detect corrupt index file in fsck' '
+       cp .git/index .git/index.backup &&
+       test_when_finished "mv .git/index.backup .git/index" &&
+       corrupt_index_checksum &&
+       test_must_fail git fsck --cache 2>errors &&
+       grep "bad index file" errors
+'
+
 test_done