diff options
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 06904c3..464fd25 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -397,8 +397,7 @@ static int merge_working_tree(struct checkout_opts *opts, } /* 2-way merge to the new branch */ - topts.initial_checkout = (!active_nr && - (old->commit == new->commit)); + topts.initial_checkout = is_cache_unborn(); topts.update = 1; topts.merge = 1; topts.gently = opts->merge; |