Skip to content

fast-import: fix lookup for new commits #2252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
becm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fast-import: fix lookup for new commits #2252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions builtin/fast-import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ static void fast_import_state_init(struct fast_import_state *state,
state->option = option;
}

static struct object_entry *dereference(struct object_entry *oe, struct object_id *oid);

static void parse_argv(struct fast_import_state *state);
static void parse_get_mark(struct fast_import_state *state, const char *p);
static void parse_cat_blob(struct fast_import_state *state, const char *p);
Expand Down Expand Up @@ -2658,12 +2660,20 @@ static void parse_from_existing(struct branch *b)
oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo);
} else {
unsigned long size;
size_t size_st = 0;
char *buf;
struct object_entry *e = find_object(&b->oid);

buf = odb_read_object_peeled(the_repository->objects, &b->oid,
OBJ_COMMIT, &size_st, &b->oid);
size = cast_size_t_to_ulong(size_st);
while (e && e->type == OBJ_TAG)
e = dereference(e, &b->oid);

if (e && e->type == OBJ_COMMIT && e->pack_id != MAX_PACK_ID) {
buf = gfi_unpack_entry(e, &size);
} else {
size_t size_st = 0;
buf = odb_read_object_peeled(the_repository->objects, &b->oid,
OBJ_COMMIT, &size_st, &b->oid);
size = cast_size_t_to_ulong(size_st);
}
parse_from_commit(b, buf, size);
free(buf);
}
Expand Down
Loading