Skip to content

Commit

Permalink
fetch-pack: do not stop traversing an already parsed commit
Browse files Browse the repository at this point in the history
f3ec549 (fetch-pack: check parse_commit/object results, 2008-03-03)
broke common ancestor computation by stopping traversal when it sees
an already parsed commit.  This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Linus Torvalds authored and Junio C Hamano committed Apr 28, 2008
1 parent e42251a commit 72269ad
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions builtin-fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ static const unsigned char* get_rev(void)

while (commit == NULL) {
unsigned int mark;
struct commit_list *parents = NULL;
struct commit_list *parents;

if (rev_list == NULL || non_common_revs == 0)
return NULL;

commit = rev_list->item;
if (!(commit->object.parsed))
if (!parse_commit(commit))
parents = commit->parents;
if (commit->object.parsed)
parse_commit(commit);
parents = commit->parents;

commit->object.flags |= POPPED;
if (!(commit->object.flags & COMMON))
Expand Down

0 comments on commit 72269ad

Please sign in to comment.