From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: git@vger.kernel.org
Subject: Re: [RFH] CE_REMOVE conversion
Date: Thu, 21 Feb 2008 08:43:56 -0800 [thread overview]
Message-ID: <7vodaauunn.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.00.0802210746410.7833@woody.linux-foundation.org> (Linus Torvalds's message of "Thu, 21 Feb 2008 08:05:42 -0800 (PST)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Thu, 21 Feb 2008, Junio C Hamano wrote:
>>
>> but I am wondering if we should instead really _remove_ entries
>> from the index instead, just like the attached patch.
> ...
> So your patch looks very good to me. Basically, the merge code absolutely
> does not want to be called with some entries already marked as CE_REMOVE
> (it's supposed to *add* those markers as part of resolving the merge, but
> it is not able to handle them in the source).
>
> So ack, ack, ack.
And we probably should unhash the entry instead of just removing
it? Come to think of it, I am starting to wonder if the
entries unpack-trees add to and drop from the index are hashed
and unhashed correctly...
next prev parent reply other threads:[~2008-02-21 16:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 8:39 [RFH] CE_REMOVE conversion Junio C Hamano
2008-02-21 9:07 ` [RFH] index_name_exists() conversion Junio C Hamano
2008-02-21 16:15 ` Linus Torvalds
2008-02-21 16:29 ` Johannes Schindelin
2008-02-21 17:00 ` Linus Torvalds
2008-02-21 16:05 ` [RFH] CE_REMOVE conversion Linus Torvalds
2008-02-21 16:43 ` Junio C Hamano [this message]
2008-02-21 17:31 ` Linus Torvalds
2008-02-21 20:06 ` Linus Torvalds
2008-02-21 20:08 ` Junio C Hamano
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=7vodaauunn.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.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.
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.