From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 01 Jan 2013 22:24:46 GMT
Subject: Re: [BUG] two-way read-tree can write null sha1s into index
Message-ID: <7vvcbg7d8x.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20121229205154.GA21058@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> So I think we need to update twoway_merge to recognize unmerged entries,
> which gives us two options:
>
>   1. Reject the merge.
>
>   2. Throw away the current unmerged entry in favor of the "new" entry
>      (when old and new are the same, of course; otherwise we would
>      reject).
>
> I think (2) is the right thing.

As "--reset" in "read-tree --reset -u A B" is a way to say "we know
we are based on A and we want to go to B no matter what", I agree we
should not reject the merge.

With -m instead of --reset, I am not sure what the right semantics
should be, though.