Skip to content

Commit

Permalink
Fixed topological sorting stuck in infinite loop.
Browse files Browse the repository at this point in the history
Signed-off-by: Vicent Marti <[email protected]>
Signed-off-by: Andreas Ericsson <[email protected]>
  • Loading branch information
vmg authored and ageric committed Jun 2, 2010
1 parent 69dca95 commit 1f798df
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
#include "revwalk.h"
#include "git/odb.h"

#define COMMIT_PRINT(commit) {\
char oid[41]; oid[40] = 0;\
git_oid_fmt(oid, &commit->object.id);\
printf("Oid: %s | In degree: %d | Time: %u\n", oid, commit->in_degree, commit->commit_time);\
}

const git_oid *git_commit_id(git_commit *c)
{
return &c->object.id;
Expand Down Expand Up @@ -256,7 +262,7 @@ void git_commit_list_push_front(git_commit_list *list, git_commit *commit)
}
else
{
list->head->next = node;
list->head->prev = node;
list->head = node;
}

Expand Down Expand Up @@ -386,7 +392,7 @@ void git_commit_list_toposort(git_commit_list *list)
git_commit_list topo;
memset(&topo, 0x0, sizeof(git_commit_list));

while ((commit = git_commit_list_pop_front(list)) != NULL)
while ((commit = git_commit_list_pop_back(list)) != NULL)
{
git_commit_node *p;

Expand All @@ -403,11 +409,11 @@ void git_commit_list_toposort(git_commit_list *list)
if (p->commit->in_degree == 0 && p->commit->topo_delay)
{
p->commit->topo_delay = 0;
git_commit_list_push_front(list, p->commit);
git_commit_list_push_back(list, p->commit);
}
}

git_commit_list_push_back(&topo, commit);
git_commit_list_push_front(&topo, commit);
}

list->head = topo.head;
Expand Down

0 comments on commit 1f798df

Please sign in to comment.