Clean up commit insertion in git-rev-list

diff --git a/rev-list.c b/rev-list.c
index 825006374a0b028b9a1980a2aee494132f3a4145..c20fec804e1fd4f88ee03647d5e86bb1e6e06e0c 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -413,8 +413,10 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
 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];
@@ -462,11 +464,12 @@ int main(int argc, char **argv)
                        limited = 1;
                        continue;
                }
-               if (!strncmp(arg, "--merge-order", 13)) {
+               if (!strcmp(arg, "--merge-order")) {
                        merge_order = 1;
+                       insert = commit_list_insert;
                        continue;
                }
-               if (!strncmp(arg, "--show-breaks", 13)) {
+               if (!strcmp(arg, "--show-breaks")) {
                        show_breaks = 1;
                        continue;
                }
@@ -482,7 +485,7 @@ int main(int argc, char **argv)
                commit = get_commit_reference(arg, flags);
                if (!commit)
                        continue;
-               insert_by_date(&list, commit);
+               insert(commit, &list);
        }
 
        if (!merge_order) {