diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
| commit | 6cd3729eae8d8945c0482423149163d40afd082c (patch) | |
| tree | 5a41d37b2d0c5f1ba62ebb6d42901ffe4b26a796 /builtin-checkout.c | |
| parent | 2baf1850ceb01dfbee862e30f2a69cf6064e13eb (diff) | |
| parent | c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0 (diff) | |
| download | git-6cd3729eae8d8945c0482423149163d40afd082c.tar.gz git-6cd3729eae8d8945c0482423149163d40afd082c.tar.xz | |
Merge branch 'maint'
* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
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 06904c3bd..464fd2570 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; |