From: David Turner <dturner@twopensource.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Brian Degenhardt <bmd@bmdhacks.com>
Subject: Re: [PATCH] cache-tree: populate cache-tree on successful merge
Date: Tue, 28 Jul 2015 16:28:24 -0400 [thread overview]
Message-ID: <1438115304.18134.33.camel@twopensource.com> (raw)
In-Reply-To: <xmqq1tfsdp60.fsf@gitster.dls.corp.google.com>
On Tue, 2015-07-28 at 13:04 -0700, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > David Turner <dturner@twopensource.com> writes:
> >
> >> The work done to produce the cache-tree is work that the commit would
> >> otherwise have to do. So we're spending extra time in one place to
> >> eliminate that work in a different place.
> >
> > Good point. Thanks.
>
> Hmm, I forgot about another codepath. What about operations that
> are purely done to pouplate the index, without necessarily creating
> a tree out of the index?
>
> The most worrisome is "git checkout $branch" (two-tree merge).
Git checkout $branch already populates the cache-tree; this is due to
patches I added last year:
commit aecf567cbfb6ab46e82f7f5df36fb6a2dd5bee69
Author: David Turner <dturner@twopensource.com>
Date: Sat Jul 5 21:06:56 2014 -0700
cache-tree: create/update cache-tree on checkout
When git checkout checks out a branch, create or update the
cache-tree so that subsequent operations are faster.
----
Admittedly, we do not test for the case where we must do a two-way merge
during a checkout, but I just tested that case, and it appears that we
do already populate the cache-tree in that case.
next prev parent reply other threads:[~2015-07-28 20:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 19:30 [PATCH] cache-tree: populate cache-tree on successful merge David Turner
2015-07-28 19:50 ` Junio C Hamano
2015-07-28 19:54 ` David Turner
2015-07-28 19:55 ` Junio C Hamano
2015-07-28 20:04 ` Junio C Hamano
2015-07-28 20:28 ` David Turner [this message]
2015-07-28 20:58 ` Junio C Hamano
2015-07-28 20:47 ` Junio C Hamano
2015-07-28 21:18 ` David Turner
2015-07-28 21:38 ` 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
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=1438115304.18134.33.camel@twopensource.com \
--to=dturner@twopensource.com \
--cc=bmd@bmdhacks.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).