From: Junio C Hamano <gitster@pobox.com>
To: Sergey Vlasov <vsu@altlinux.ru>
Cc: git@vger.kernel.org, Martin Koegler <mkoegler@auto.tuwien.ac.at>
Subject: Re: [PATCH] fsck.c: fix bogus "empty tree" check
Date: Tue, 04 Mar 2008 11:57:14 -0800 [thread overview]
Message-ID: <7vfxv65kkl.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080304152635.40451f7c.vsu@altlinux.ru> (Sergey Vlasov's message of "Tue, 4 Mar 2008 15:26:35 +0300")
Sergey Vlasov <vsu@altlinux.ru> writes:
>> I'll revert the following two commits for now:
>>
>> d5ef408 (unpack-objects: prevent writing of inconsistent objects)
>> 28f72a0 (receive-pack: use strict mode for unpacking objects)
>>
>> as I have verified that running with receive.fsckobjects set to false
>> fixes the issues for me, and the repository at the receiving end (both
>> before and after the push) pass git-fsck without problems. Needless to
>> say, I am not a happy camper right now.
>
> This part of commit d5ef408 changes is bogus:
>
>> @@ -144,9 +205,36 @@ static void added_object(unsigned nr, enum object_type type,
>> static void write_object(unsigned nr, enum object_type type,
>> void *buf, unsigned long size)
>> {
>> - if (write_sha1_file(buf, size, typename(type), obj_list[nr].sha1) < 0)
>> - die("failed to write object");
>> added_object(nr, type, buf, size);
>
> The write_sha1_file() call here was calculating obj_list[nr].sha1; now
> it is removed, but added_object() needs this value:
Thanks, somehow I missed that when merging it up for 'next'.
> However, I do not have time to create a proper test case for this.
That's Ok. What we need is a fix but it is not that urgent as the stuff
is now reverted for now.
Sorry for being a sloppy maintainer. I have to admit that I did not read
every single line of patches in a few topics merged to 'master' recently,
due to workload pressure, and some extra eyeballs after-the-fact are
greatly appreciated.
next prev parent reply other threads:[~2008-03-04 19:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-04 11:21 [PATCH] fsck.c: fix bogus "empty tree" check Junio C Hamano
2008-03-04 12:26 ` Sergey Vlasov
2008-03-04 19:57 ` Junio C Hamano [this message]
2008-03-05 8:47 ` [PATCH] t5300: add test for "unpack-objects --strict" Junio C Hamano
2008-03-05 9:17 ` [PATCH v2] " Junio C Hamano
2008-03-04 21:48 ` [PATCH] fsck.c: fix bogus "empty tree" check Martin Koegler
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=7vfxv65kkl.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mkoegler@auto.tuwien.ac.at \
--cc=vsu@altlinux.ru \
/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 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 NNTP newsgroup(s).