builtin/checkout: learn -B

diff --git a/revision.c b/revision.c
index 71fec3c63a8af567ef7fe3e83e643df8a686d8a0..7847921658c0f0b13c51650057b907ee431b1378 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) {
@@ -1190,6 +1190,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 +1884,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)