From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twosigma.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH 1/3] tree-walk: be more specific about corrupt tree errors
Date: Mon, 26 Sep 2016 21:01:15 -0700 [thread overview]
Message-ID: <xmqqtwd2ng8k.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1474935093-26757-1-git-send-email-dturner@twosigma.com> (David Turner's message of "Mon, 26 Sep 2016 20:11:31 -0400")
David Turner <dturner@twosigma.com> writes:
> From: Jeff King <peff@peff.net>
>
> When the tree-walker runs into an error, it just calls
> die(), and the message is always "corrupt tree file".
> However, we are actually covering several cases here; let's
> give the user a hint about what happened.
>
> Let's also avoid using the word "corrupt", which makes it
> seem like the data bit-rotted on disk. Our sha1 check would
> already have found that. These errors are ones of data that
> is malformed in the first place.
>
> Signed-off-by: David Turner <dturner@twosigma.com>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> t/t1007-hash-object.sh | 15 +++++++++++++--
> t/t1007/.gitattributes | 1 +
> t/t1007/tree-with-empty-filename | Bin 0 -> 28 bytes
> t/t1007/tree-with-malformed-mode | Bin 0 -> 39 bytes
> tree-walk.c | 12 +++++++-----
> 5 files changed, 21 insertions(+), 7 deletions(-)
> create mode 100644 t/t1007/.gitattributes
> create mode 100644 t/t1007/tree-with-empty-filename
> create mode 100644 t/t1007/tree-with-malformed-mode
I hate to report this, but this alone, or together with 2/2, when
merged to 'pu', I cannot get them to pass the tests in my automated
integration tests, even though they seem to pass when the problematic
tests are run manually. I do not see offhand anything suspicious
(like something that may be racy) in these two patches but I haven't
figured out where it goes wrong.
If somebody manages to find breakages in today's 'pu', please (1) do
not be too alarmed, and (2) help figure out where things are broken.
Thanks.
next prev parent reply other threads:[~2016-09-27 4:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 0:11 [PATCH 1/3] tree-walk: be more specific about corrupt tree errors David Turner
2016-09-27 0:11 ` [PATCH 2/3] fsck: handle bad trees like other errors David Turner
2016-09-27 0:11 ` [PATCH 3/3] add David Turner's Two Sigma address David Turner
2016-09-27 0:13 ` David Turner
2016-09-27 4:01 ` Junio C Hamano [this message]
2016-09-27 4:53 ` [PATCH 1/3] tree-walk: be more specific about corrupt tree errors Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtwd2ng8k.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.