From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ben Lynn <benlynn@gmail.com>, git@vger.kernel.org
Subject: Re: git bugs
Date: Thu, 12 Jun 2008 13:06:17 -0700 [thread overview]
Message-ID: <7v4p7y1kqu.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0806101028040.3101@woody.linux-foundation.org> (Linus Torvalds's message of "Tue, 10 Jun 2008 10:44:43 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> The other approach is to know that an empty blob always has a very
> specific SHA1. Here's an trial patch.
> read-cache.c | 16 ++++++++++++++++
> 1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 8e5fbb6..f83de8c 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> ...
> @@ -193,6 +203,12 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
> if (ce->ce_size != (unsigned int) st->st_size)
> changed |= DATA_CHANGED;
>
> + /* Racily smudged entry? */
> + if (!ce->ce_size) {
> + if (!is_empty_blob_sha1(ce->sha1))
> + changed |= DATA_CHANGED;
> + }
> +
> return changed;
> }
Thanks. This would be a good fix to the issue.
The only theoretical worry I can think of is if there is an insane
convert_to_worktree() filter that turns a non-empty blob into an empty
work tree file.
An "In blobs, always store everything as UTF16 with BOM" filter, when
badly implemented, might turn an empty work tree file into a blob with BOM
and nothing else in it, but we can safely declare that such use case is
simply insane and broken ;-).
next prev parent reply other threads:[~2008-06-12 20:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 8:41 git bugs Ben Lynn
2008-06-10 16:58 ` Daniel Barkalow
2008-06-10 17:44 ` Linus Torvalds
2008-06-10 18:45 ` Ben Lynn
2008-06-10 20:06 ` Linus Torvalds
2008-06-10 23:09 ` Ben Lynn
2008-06-10 23:38 ` Junio C Hamano
2008-06-11 0:02 ` Ben Lynn
2008-06-11 0:20 ` Junio C Hamano
2008-06-11 0:24 ` Ben Lynn
2008-06-11 0:53 ` Ben Lynn
2008-06-11 12:46 ` Stephen R. van den Berg
2008-06-12 6:51 ` Ben Lynn
2008-06-11 1:36 ` Linus Torvalds
2008-06-11 2:04 ` Ben Lynn
2008-06-11 2:12 ` Linus Torvalds
2008-06-11 2:31 ` Ben Lynn
2008-06-11 2:39 ` Linus Torvalds
2008-06-11 5:58 ` Ben Lynn
2008-06-11 6:18 ` Ben Lynn
2008-06-11 14:54 ` Linus Torvalds
2008-06-11 17:52 ` Ben Lynn
2008-06-11 18:10 ` Linus Torvalds
2008-06-11 18:48 ` Ben Lynn
2008-06-11 18:53 ` Linus Torvalds
2008-06-11 20:57 ` Ben Lynn
2008-06-11 21:50 ` Junio C Hamano
2008-06-11 14:52 ` Linus Torvalds
2008-06-12 20:06 ` Junio C Hamano [this message]
2008-06-13 10:10 ` Jeff King
2008-06-13 23:09 ` Junio C Hamano
2008-06-14 6:25 ` Jeff King
2008-06-12 3:17 ` Shawn O. Pearce
2008-06-12 6:46 ` Ben Lynn
2008-06-12 7:12 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2017-02-23 20:27 Sean Hunt
2017-02-24 16:52 ` Johannes Schindelin
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=7v4p7y1kqu.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=benlynn@gmail.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).