development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fast-export: do not parse non-commit objects while reading marks file

Browse source 
We read from the marks file and keep only marked commits, but in
order to find the type of object, we are parsing the whole thing,
which is slow, specially in big repositories with lots of big files.

There's no need for that, we can query the object information with
sha1_object_info().

Before this, loading the objects of a fresh emacs import, with 260598
blobs took 14 minutes, after this patch, it takes 3 seconds.

This is the way fast-import does it. Also die if the object is not
found (like fast-import).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-05 17:38:53 -05:00 committed by Junio C Hamano
parent 7d3ccdffb5
commit e6812cfa9a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builtin/fast-export.c
View file

@ -613,6 +613,7 @@ static void import_marks(char *input_file)
char *line_end, *mark_end;
unsigned char sha1[20];
struct object *object;
enum object_type type;
line_end = strchr(line, '\n');
if (line[0] != ':' || !line_end)
@ -627,17 +628,19 @@ static void import_marks(char *input_file)
if (last_idnum < mark)
last_idnum = mark;
object = parse_object(sha1);
if (!object)
type = sha1_object_info(sha1, NULL);
if (type < 0)
die("object not found: %s", sha1_to_hex(sha1));
if (type != OBJ_COMMIT)
/* only commits */
continue;
object = parse_object(sha1);
if (object->flags & SHOWN)
error("Object %s already has a mark", sha1_to_hex(sha1));
if (object->type != OBJ_COMMIT)
/* only commits */
continue;
mark_object(object, mark);
object->flags |= SHOWN;