[PATCH] Fix --merge-order unit test breaks introduced by 6c88be16

The sensible cleanup of the in-memory storage order of commit parents broke the --merge-order
code which was dependent on the previous behaviour of parse_commit().

This patch restores the correctness --merge-order behaviour by taking account of the
new behaviour of parse_commit.
Signed-off-by: NJon Seymour <jon.seymour@gmail.com>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

epoch.c

@@ -424,18 +424,9 @@ static void mark_ancestors_uninteresting(struct commit *commit)
 static void sort_first_epoch(struct commit *head, struct commit_list **stack)
 {
 	struct commit_list *parents;
-	struct commit_list *reversed_parents = NULL;
 
 	head->object.flags |= VISITED;
 
-	/*
-	 * parse_commit() builds the parent list in reverse order with respect
-	 * to the order of the git-commit-tree arguments. So we need to reverse
-	 * this list to output the oldest (or most "local") commits last.
-	 */
-	for (parents = head->parents; parents; parents = parents->next)
-		commit_list_insert(parents->item, &reversed_parents);
-
 	/*
 	 * TODO: By sorting the parents in a different order, we can alter the
 	 * merge order to show contemporaneous changes in parallel branches
@@ -445,8 +436,8 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack)
 	 * changes.
 	 */
 
-	while (reversed_parents) {
-		struct commit *parent = pop_commit(&reversed_parents);
+	for (parents = head->parents; parents; parents = parents->next) {
+		struct commit *parent = parents->item;
 
 		if (head->object.flags & UNINTERESTING) {
 			/*
@@ -470,7 +461,7 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack)
 
 			} else {
 				sort_first_epoch(parent, stack);
-				if (reversed_parents) {
+				if (parents) {
 					/*
 					 * This indicates a possible
 					 * discontinuity it may not be be