This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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>
  • Loading branch information...
1 parent d4072c9 commit 2ed02887bda74871bad64f1be36fb4f60d07706e Linus Torvalds committed with Junio C Hamano Nov 14, 2005
Showing with 3 additions and 2 deletions.
  1. +3 −2 commit.c
View
@@ -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;
}

0 comments on commit 2ed0288

Please sign in to comment.