From: Dmitry Ivankov <divanorama@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
David Barr <davidbarr@google.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: [PATCH 1/8] fast-import: cache oe in file_change_m
Date: Mon, 19 Sep 2011 07:27:30 +0600 [thread overview]
Message-ID: <1316395657-6991-2-git-send-email-divanorama@gmail.com> (raw)
In-Reply-To: <1316395657-6991-1-git-send-email-divanorama@gmail.com>
file_change_m checks object type for objects specified by sha1. It does
so via sha1_object_info but doesn't cache this information in struct
object_entry.
Make this call to sha1_object_info cached in struct object_entry.
Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
---
fast-import.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 742e7da..42f9b17 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2297,15 +2297,21 @@ static void file_change_m(struct branch *b)
} else {
enum object_type expected = S_ISDIR(mode) ?
OBJ_TREE: OBJ_BLOB;
- enum object_type type = oe ? oe->type :
- sha1_object_info(sha1, NULL);
- if (type < 0)
- die("%s not found: %s",
- S_ISDIR(mode) ? "Tree" : "Blob",
- command_buf.buf);
- if (type != expected)
+ if (!oe)
+ oe = insert_object(sha1);
+ if (!oe->idx.offset) {
+ enum object_type type = sha1_object_info(oe->idx.sha1, NULL);
+ if (type < 0)
+ die("%s not found: %s",
+ S_ISDIR(mode) ? "Tree" : "Blob",
+ command_buf.buf);
+ oe->type = type;
+ oe->pack_id = MAX_PACK_ID;
+ oe->idx.offset = 1; /* nonzero */
+ }
+ if (oe->type != expected)
die("Not a %s (actually a %s): %s",
- typename(expected), typename(type),
+ typename(expected), typename(oe->type),
command_buf.buf);
}
--
1.7.3.4
next prev parent reply other threads:[~2011-09-19 1:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 1:27 [PATCH 0/8] fast-import: cache oe more often Dmitry Ivankov
2011-09-19 1:27 ` Dmitry Ivankov [this message]
2011-09-19 1:27 ` [PATCH 2/8] fast-import: cache oe in parse_new_tag Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 3/8] fast-import: cache oe in note_change_n Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 4/8] fast-import: extract common sha1_file access functions Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 5/8] fast-import: tiny optimization in read_marks Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 6/8] fast-import: cache oe in load_tree Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 7/8] fast-import: cache oe in cat_blob Dmitry Ivankov
2011-09-19 1:27 ` [PATCH 8/8] fast-import: cache objects while dereferencing Dmitry Ivankov
2011-09-20 4:02 ` [PATCH 0/8] fast-import: cache oe more often Junio C Hamano
2011-09-20 4:26 ` Jonathan Nieder
2011-09-20 7:17 ` Dmitry Ivankov
2011-09-20 14:39 ` Jonathan Nieder
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=1316395657-6991-2-git-send-email-divanorama@gmail.com \
--to=divanorama@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=spearce@spearce.org \
--cc=srabbelier@gmail.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.
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).