Fixed topological sorting stuck in infinite loop. Signed-off-by: Vicent Marti <tanoku@gmail.com> Signed-off-by: Andreas Ericsson <ae@op5.se>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/src/commit.c b/src/commit.c
index 53d25ee..02e741c 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -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;
@@ -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;
}
@@ -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;
@@ -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;