From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Brandon Williams <bwilliamseng@gmail.com>,
git <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: invalid tree and commit object
Date: Thu, 21 May 2020 11:51:33 +0200 [thread overview]
Message-ID: <8cdbcd9b-b18d-d1d0-eec7-16f4139dbaf9@web.de> (raw)
In-Reply-To: <xmqq4ksmsaks.fsf@gitster.c.googlers.com>
Am 11.05.20 um 18:25 schrieb Junio C Hamano:
> René Scharfe <l.s.r@web.de> writes:
>> +
>> + /*
>> + * There can be non-consecutive duplicates due to the implicitly
>> + * add slash, e.g.:
>
> s/add slash/added slash/, or even "added slash at the end of the
> name of a tree object".
Thanks for spotting the typo. I think the short one suffices as the
sentence below (and earlier comments) already cover it.
>> + *
>> + * foo
>> + * foo.bar
>> + * foo.bar.baz
>> + * foo.bar/
>> + * foo/
>> + *
>> + * Record non-directory candidates (like "foo" and "foo.bar" in
>> + * the example) on a stack and check directory candidates (like
>> + * foo/" and "foo.bar/") against that stack.
>> + */
> Side note. this is nice but is subtle. I'd need to retrace
> the thoughts on this part again later to convince myself
> that we are not missing anything.
Yes, it's tricky, and we do miss something, as I mentioned in the test
coverage thread. I'll reply with patches.
René
next prev parent reply other threads:[~2020-05-21 9:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 6:19 invalid tree and commit object Brandon Williams
2020-05-09 10:16 ` René Scharfe
2020-05-09 7:16 ` Johannes Schindelin
2020-05-09 11:51 ` René Scharfe
2020-05-09 17:28 ` Junio C Hamano
2020-05-09 19:24 ` René Scharfe
2020-05-09 20:27 ` Junio C Hamano
2020-05-10 9:07 ` René Scharfe
2020-05-10 16:12 ` René Scharfe
2020-05-11 16:25 ` Junio C Hamano
2020-05-13 16:27 ` Brandon Williams
2020-05-21 9:51 ` René Scharfe [this message]
2020-05-21 9:52 ` [PATCH 1/4] fsck: fix a typo in a comment René Scharfe
2020-05-21 10:10 ` Denton Liu
2020-05-21 11:15 ` René Scharfe
2020-05-21 9:52 ` [PATCH 2/4] t1450: increase test coverage of in-tree d/f detection René Scharfe
2020-05-21 10:20 ` Denton Liu
2020-05-21 13:31 ` René Scharfe
2020-05-21 18:01 ` Junio C Hamano
2020-05-21 9:52 ` [PATCH 3/4] t1450: demonstrate undetected in-tree d/f conflict René Scharfe
2020-05-21 9:52 ` [PATCH 4/4] fsck: detect more in-tree d/f conflicts René Scharfe
2020-05-10 16:37 ` invalid tree and commit object Junio C Hamano
2020-05-21 9:51 ` René Scharfe
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=8cdbcd9b-b18d-d1d0-eec7-16f4139dbaf9@web.de \
--to=l.s.r@web.de \
--cc=bwilliamseng@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).