summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-11-14 18:01:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-14 22:16:38 (GMT)
commit2ed02887bda74871bad64f1be36fb4f60d07706e (patch)
tree359343ed6f24dc27f834df0b71902e484cca624b /commit.c
parentd4072c9722d1ef28abe8ef0eb0b244017fff3f42 (diff)
downloadgit-2ed02887bda74871bad64f1be36fb4f60d07706e.zip
git-2ed02887bda74871bad64f1be36fb4f60d07706e.tar.gz
git-2ed02887bda74871bad64f1be36fb4f60d07706e.tar.bz2
Fix git-rev-list "date order" with --topo-order
This fixes git-rev-list so that when there are multiple branches, we still sort the heads in proper approximate date order even when sorting the output topologically. This makes things like gitk --all -d work sanely and show the branches in date order (where "date order" is obviously modified by the paren-child dependency requirements of the topological sort). The trivial fix is to just build the "work" list in date order rather than inserting the new work entries at the beginning. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 534c03e..ebf4db6 100644
--- a/commit.c
+++ b/commit.c
@@ -536,7 +536,7 @@ int count_parents(struct commit * commit)
void sort_in_topological_order(struct commit_list ** list)
{
struct commit_list * next = *list;
- struct commit_list * work = NULL;
+ struct commit_list * work = NULL, **insert;
struct commit_list ** pptr = list;
struct sort_node * nodes;
struct sort_node * next_nodes;
@@ -580,11 +580,12 @@ void sort_in_topological_order(struct commit_list ** list)
* the tips serve as a starting set for the work queue.
*/
next=*list;
+ insert = &work;
while (next) {
struct sort_node * node = (struct sort_node *)next->item->object.util;
if (node->indegree == 0) {
- commit_list_insert(next->item, &work);
+ insert = &commit_list_insert(next->item, insert)->next;
}
next=next->next;
}