From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff Hostetler <git@jeffhostetler.com>,
Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org, peff@peff.net,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH v7] read-cache: force_verify_index_checksum
Date: Tue, 25 Apr 2017 23:04:33 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1704252225450.3480@virtualbox> (raw)
In-Reply-To: <xmqqk269xmmq.fsf@gitster.mtv.corp.google.com>
Hi,
On Mon, 24 Apr 2017, Junio C Hamano wrote:
> Jeff Hostetler <git@jeffhostetler.com> writes:
>
> >>> +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 &&
> >>
> >> sed on a binary file? Sooner or later we are going to run into
> >> portability issues.
> >
> > In v5 of this patch series I used "perl" and it was suggested that I
> > use "sed" instead. It doesn't matter to me which we use. My testing
> > showed that it was safe, but that was only Linux.
I am sorry to hear that the Git mailing list's review gives you whiplash.
The problem with sed is that BSD sed behaves a bit differently than GNU
sed, and we quietly expect every contributor to be an expert in the
portability aspects of sed.
TBH I am quite surprised that anybody would have suggested to use sed
rather than Perl to edit binary files in the first place. In my opinion,
that was bad advice.
> > Does the mailing list have a preference for this ?
>
> Instead of munging pathnames z* to y*, I'd prefer to see the actual
> checksum bytes at the end replaced in the index file. After all
> that is what this test really cares about, and it ensures that the
> failure detected is due to checksum mismatch.
I see that v8 uses a Perl script again, and it is well written and
obvious.
Just in case that certain reviewers favor length over readability, let me
offer this snippet:
size=$(perl -e "print -s \".git/index\"") &&
dd if=/dev/zero of=.git/index bs=1 seek=$(($size-20) count=20
Since whatever hash will be used in the future is most likely larger than
20 bytes, this should still work fine (and even if somebody sane replaces
the SHA-1 of the index with a CRC-32 for the same benefit we have now, the
test will fail quickly and it is easy to replace the 20 by 4).
Ciao,
Dscho
next prev parent reply other threads:[~2017-04-25 21:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 20:32 [PATCH v7] read-cache: call verify_hdr() in a background thread git
2017-04-14 20:32 ` [PATCH v7] read-cache: force_verify_index_checksum git
2017-04-24 17:26 ` Johannes Sixt
2017-04-24 18:39 ` Jeff Hostetler
2017-04-25 2:10 ` Junio C Hamano
2017-04-25 21:04 ` Johannes Schindelin [this message]
2017-04-26 3:25 ` Junio C Hamano
2017-05-08 9:45 ` Christian Couder
2017-05-08 16:50 ` Jeff Hostetler
2017-05-08 20:03 ` Christian Couder
2017-05-08 20:18 ` Jeff Hostetler
2017-05-09 2:11 ` Junio C Hamano
2017-05-09 5:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1704252225450.3480@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jeffhost@microsoft.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).