threads / patch / 1121

patch, 6 partsTemporary fixup to rev-list.c to restore expected order of arguments presented to --merge-order sort.

Subject: [PATCH 1/6] Temporary fixup to rev-list.c to restore expected order of arguments presented to --merge-order sort.

## tl;dr

One message between Jul 6, 2005 and Jul 6, 2005. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Jon Seymour· Jul 6, 2005, 07:51 UTC · lore

This patch adds a hacky special case to the rev-list main to restore the order in which the --merge-order sort algorithm receives arguments.

A subsequent patch will abstract this out more cleanly.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 rev-list.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
c63fe4678d33db15db076606f7a133868e91f1bc
Show changes to rev-list.c +4 −1
diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -482,7 +482,10 @@ int main(int argc, char **argv)
 		commit = get_commit_reference(arg, flags);
 		if (!commit)
 			continue;
-		insert_by_date(&list, commit);
+		if (!merge_order) 
+			insert_by_date(&list, commit);
+		else 
+			commit_list_insert(commit, &list);
 	}
 
 	if (!merge_order) {		
------------

← back to recent threads