merge-recursive --patience

diff --git a/revision.c b/revision.c
index 71fec3c63a8af567ef7fe3e83e643df8a686d8a0..540358184d7f05e57b183ac0f4e5658e34b2a611 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -745,7 +745,7 @@ static int limit_list(struct rev_info *revs)
        if (revs->ancestry_path) {
                bottom = collect_bottom_commits(list);
                if (!bottom)
-                       die("--ancestry-path given but there is no bottom commits");
+                       die("--ancestry-path given but there are no bottom commits");
        }
 
        while (list) {
@@ -1162,18 +1162,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 
        if (!prefixcmp(arg, "--max-count=")) {
                revs->max_count = atoi(arg + 12);
+               revs->no_walk = 0;
        } else if (!prefixcmp(arg, "--skip=")) {
                revs->skip_count = atoi(arg + 7);
        } else if ((*arg == '-') && isdigit(arg[1])) {
        /* accept -<digit>, like traditional "head" */
                revs->max_count = atoi(arg + 1);
+               revs->no_walk = 0;
        } else if (!strcmp(arg, "-n")) {
                if (argc <= 1)
                        return error("-n requires an argument");
                revs->max_count = atoi(argv[1]);
+               revs->no_walk = 0;
                return 2;
        } else if (!prefixcmp(arg, "-n")) {
                revs->max_count = atoi(arg + 2);
+               revs->no_walk = 0;
        } else if (!prefixcmp(arg, "--max-age=")) {
                revs->max_age = atoi(arg + 10);
        } else if (!prefixcmp(arg, "--since=")) {
@@ -1190,6 +1194,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
                revs->first_parent_only = 1;
        } else if (!strcmp(arg, "--ancestry-path")) {
                revs->ancestry_path = 1;
+               revs->simplify_history = 0;
                revs->limited = 1;
        } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
                init_reflog_walk(&revs->reflog_info);
@@ -1883,7 +1888,7 @@ int prepare_revision_walk(struct rev_info *revs)
 enum rewrite_result {
        rewrite_one_ok,
        rewrite_one_noparents,
-       rewrite_one_error,
+       rewrite_one_error
 };
 
 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)