diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2017-04-25 18:41:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-27 09:41:19 +0900 |
| commit | 4d9bc37fbe9902fc033573cf7375b528fc6a434e (patch) | |
| tree | d4b7093eb941c1eae7fd0088b41f63701630babc | |
| parent | a33fc72fe911fdb8e284c94e08e8f1dafe4d3187 (diff) | |
| download | git-4d9bc37fbe9902fc033573cf7375b528fc6a434e.tar.gz | |
t1450: avoid use of "sed" on the index, which is a binary filejh/verify-index-checksum-only-in-fsck
The previous step added a path zzzzzzzz to the index, and then used
"sed" to replace this string to yyyyyyyy to create a test case where
the checksum at the end of the file does not match the contents.
Unfortunately, use of "sed" on a non-text file is not portable.
Instead, use a Perl script that seeks to the end and modifies the
last byte of the file (where we _know_ stores the trailing
checksum).
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1450-fsck.sh | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 677e15a7a4..adf0bc88ba 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,17 +689,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" && - echo zzzzzzzz >zzzzzzzz && - git add zzzzzzzz && - sed -e "s/zzzzzzzz/yyyyyyyy/" .git/index >.git/index.yyy && - mv .git/index.yyy .git/index && - # Confirm that fsck detects invalid checksum - test_must_fail git fsck --cache && - # Confirm that status no longer complains about invalid checksum - git status + corrupt_index_checksum && + test_must_fail git fsck --cache 2>errors && + grep "bad index file" errors ' test_done |