From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/4] Revisiting cache-tree
Date: Mon, 20 Apr 2009 03:58:16 -0700 [thread overview]
Message-ID: <1240225100-29960-1-git-send-email-gitster@pobox.com> (raw)
This series consists of a fix meant for maint branch, and two performance
fix. The second one is a refactoring of the code to support the latter.
I was doing a rather huge import as a multi-step process by doing
something like this:
$ rm -f $GIT_DIR/index
$ git add some ;# this one is huge
$ git tag one $(git write-tree)
$ git repack -a -d
$ rm -f $GIT_DIR/index
$ git add other ;# this one is also huge
$ git tag two $(git write-tree)
$ git repack -a -d
$ git read-tree some other
$ git tag both $(git write-tree)
$ git repack -a -d
The binding of two distinct subtrees is done with the read-tree but it
wrote out an incorrect index (notice the lack of -m; with -m option the
command correctly does a different thing) and resulted in a corrupt tree
object.
Junio C Hamano (4):
read-tree A B: do not corrupt cache-tree
Move prime_cache_tree() to cache-tree.c
read-tree -m A B: prime cache-tree from the switched-to tree
checkout branch: prime cache-tree fully
builtin-checkout.c | 10 +++++++++-
builtin-read-tree.c | 48 ++++++++----------------------------------------
cache-tree.c | 34 ++++++++++++++++++++++++++++++++++
cache-tree.h | 4 ++++
4 files changed, 55 insertions(+), 41 deletions(-)
next reply other threads:[~2009-04-20 11:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-20 10:58 Junio C Hamano [this message]
2009-04-20 10:58 ` [PATCH 1/4] read-tree A B: do not corrupt cache-tree Junio C Hamano
2009-04-20 10:58 ` [PATCH 2/4] Move prime_cache_tree() to cache-tree.c Junio C Hamano
2009-04-20 10:58 ` [PATCH 3/4] read-tree -m A B: prime cache-tree from the switched-to tree Junio C Hamano
2009-04-20 10:58 ` [PATCH 4/4] checkout branch: prime cache-tree fully Junio C Hamano
2009-04-20 13:08 ` [PATCH 0/4] Revisiting cache-tree Alex Riesen
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=1240225100-29960-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.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 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).