[PATCH] Ensure list insertion method does not depend on position of --merge-order argument

From

Jon Seymour <jon.seymour@gmail.com>

Date

Jul 7, 2005, 00:59 UTC

Message-ID

<20050707005913.16295.qmail@blackcubes.dyndns.org>

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
Linus: if you'd prefer to fix this a different way, that's fine by me!
---

 rev-list.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

8723420366d839123ca4186c60469fd38fd4b798

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -411,10 +411,8 @@ static struct commit *get_commit_referen
 int main(int argc, char **argv)
 {
 	struct commit_list *list = NULL;
-	struct commit_list *(*insert)(struct commit *, struct commit_list **);
 	int i, limited = 0;
 
-	insert = insert_by_date;
 	for (i = 1 ; i < argc; i++) {
 		int flags;
 		char *arg = argv[i];
@@ -464,7 +462,6 @@ int main(int argc, char **argv)
 		}
 		if (!strcmp(arg, "--merge-order")) {
 		        merge_order = 1;
-		        insert = commit_list_insert;
 			continue;
 		}
 		if (!strcmp(arg, "--show-breaks")) {
@@ -491,10 +488,11 @@ int main(int argc, char **argv)
 		if (commit->object.flags & DUPCHECK)
 			continue;
 		commit->object.flags |= DUPCHECK;
-		insert(commit, &list);
+		commit_list_insert(commit, &list);
 	}
 
 	if (!merge_order) {		
+		sort_by_date(&list);
 	        if (limited)
 			list = limit_list(list);
 		if (topo_order)
------------