summaryrefslogtreecommitdiff
path: root/src/commit.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2010-05-25 22:59:50 +0200
committerAndreas Ericsson <ae@op5.se>2010-06-02 10:32:07 +0200
commit1f798df229a70aaa4ee221ecc0e24025ad92ed9a (patch)
treeb6c9e4203b69a576ac5c462241a7e2f676cf551e /src/commit.c
parent69dca959508cd04b226b3747c0c07f89f3bd1a87 (diff)
downloadlibgit2-1f798df229a70aaa4ee221ecc0e24025ad92ed9a.tar.gz
Fixed topological sorting stuck in infinite loop.
Signed-off-by: Vicent Marti <tanoku@gmail.com> Signed-off-by: Andreas Ericsson <ae@op5.se>
Diffstat (limited to 'src/commit.c')
-rw-r--r--src/commit.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/commit.c b/src/commit.c
index 53d25eef..02e741c6 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;