From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paolo Bonzini <bonzini@gnu.org>,
Miklos Vajna <vmiklos@frugalware.org>, Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [RFH] two and half potential fixlets to the in-core index handling
Date: Sat, 23 Aug 2008 12:21:38 -0700 [thread overview]
Message-ID: <7vwsi7y1tp.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7v1w0fzgpc.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sat, 23 Aug 2008 12:14:55 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
>> On Sat, 23 Aug 2008, Junio C Hamano wrote:
>>>
>>> A hacky solution I have in the attached patch is to waste an xmalloc(1)
>>> and store it there when o->result is created, and also make
>>> read_from_index() pay attention to the cache_nr and the cache_changed
>>> bit. I think it is the safest and minimum fix.
>>
>> Hmm. Wouldn't it be nicer to just add another bit to istate? We have the
>> space already, since we already have a bitfield there, with just one bit
>> used?
>
> cache_changed can also become a single-bit field.
>
> The oldest "the_index" users work from it in the BSS initialized all
> zero. We'd also need to mark it as initialized, wouldn't we?
Ah, sorry, even they start with read_cache() to read .git/index (which may
not exist yet, which is fine).
Sorry for a stupid thinko.
prev parent reply other threads:[~2008-08-23 19:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-22 6:36 [bug] git `next' does not do trivial merges Paolo Bonzini
2008-08-22 19:31 ` Jeff King
2008-08-23 6:08 ` Miklos Vajna
2008-08-23 8:14 ` [PATCH] Fix in-index merge Miklos Vajna
2008-08-23 8:17 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Miklos Vajna
2008-08-23 9:01 ` Junio C Hamano
2008-08-23 10:57 ` Miklos Vajna
2008-08-23 19:55 ` Junio C Hamano
2008-08-23 19:56 ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
2008-08-24 1:58 ` Junio C Hamano
2008-08-28 13:43 ` [PATCH] builtin-merge: avoid run_command_v_opt() for recursive and subtree Miklos Vajna
2008-08-23 19:57 ` [PATCH 2/2] unpack_trees(): protect the handcrafted in-core index from read_cache() Junio C Hamano
2008-08-23 9:50 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Junio C Hamano
2008-08-23 8:50 ` [PATCH] Fix in-index merge Junio C Hamano
2008-08-23 10:41 ` Miklos Vajna
2008-08-23 9:19 ` Paolo Bonzini
2008-08-23 9:55 ` Junio C Hamano
2008-08-23 10:00 ` Junio C Hamano
2008-08-23 10:41 ` [RFH] two and half potential fixlets to the in-core index handling Junio C Hamano
2008-08-23 18:13 ` Linus Torvalds
2008-08-23 19:14 ` Junio C Hamano
2008-08-23 19:21 ` Junio C Hamano [this message]
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=7vwsi7y1tp.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
--cc=vmiklos@frugalware.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.