checkout -m: do not try to fall back to --merge from an unborn branch

If switching from an unborn branch (= empty tree) to a valid commit failed
without -m, it would fail with -m option as well.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-checkout.c b/builtin-checkout.c
index c107fd643a452edb016f7ad867d4b2a555d9abaf..b76cd22776299955d1ff876b5668f2336b4321a2 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -272,7 +272,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                topts.initial_checkout = is_cache_unborn();
                topts.update = 1;
                topts.merge = 1;
                topts.initial_checkout = is_cache_unborn();
                topts.update = 1;
                topts.merge = 1;

-               topts.gently = opts->merge;
+               topts.gently = opts->merge && old->commit;

                topts.verbose_update = !opts->quiet;
                topts.fn = twoway_merge;
                topts.dir = xcalloc(1, sizeof(*topts.dir));
                topts.verbose_update = !opts->quiet;
                topts.fn = twoway_merge;
                topts.dir = xcalloc(1, sizeof(*topts.dir));


@@ -294,7 +294,13 @@ static int merge_working_tree(struct checkout_opts *opts,
                        struct tree *work;
                        if (!opts->merge)
                                return 1;
                        struct tree *work;
                        if (!opts->merge)
                                return 1;

-                       parse_commit(old->commit);
+
+                       /*
+                        * Without old->commit, the below is the same as
+                        * the two-tree unpack we already tried and failed.
+                        */
+                       if (!old->commit)
+                               return 1;

 
                        /* Do more real merge */
 
 
                        /* Do more real merge */