diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:37:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:37:06 -0800 |
| commit | 814035c12a07927ea03350184a14f869cdce7276 (patch) | |
| tree | 2bd7e76205be964e7379cc2d9fd2e7dc71003599 /builtin-checkout.c | |
| parent | 18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa (diff) | |
| parent | 011c181cc656c8b3e48882729d1b6238e8c5c537 (diff) | |
| download | git-814035c12a07927ea03350184a14f869cdce7276.tar.gz | |
Merge branch 'maint-1.6.3' into maint-1.6.4
* maint-1.6.3:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Conflicts:
builtin-commit.c
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index c6d6ac99f6..e2dd0cd0c0 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -396,7 +396,7 @@ static int merge_working_tree(struct checkout_opts *opts, 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)); @@ -421,7 +421,13 @@ static int merge_working_tree(struct checkout_opts *opts, struct merge_options o; 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 */ |