diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
| commit | d1a251a1fa686dc98f7e3160143dfa809ec1a51d (patch) | |
| tree | 21721377ebe5950aded37c52b264d4cfe22106a9 /builtin/checkout.c | |
| parent | Merge branch 'sg/diff-indent-heuristic-non-experimental' (diff) | |
| parent | checkout: remove duplicate code (diff) | |
| download | tgif-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.tar.xz | |
Merge branch 'en/checkout-mismerge-fix'
Fix a mismerge that happened in 2.22 timeframe.
* en/checkout-mismerge-fix:
checkout: remove duplicate code
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 8d3ad7cd9e..0a3679eb77 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -731,13 +731,6 @@ static int merge_working_tree(const struct checkout_opts *opts, "the following files:\n%s"), sb.buf); strbuf_release(&sb); - if (repo_index_has_changes(the_repository, - get_commit_tree(old_branch_info->commit), - &sb)) - warning(_("staged changes in the following files may be lost: %s"), - sb.buf); - strbuf_release(&sb); - /* Do more real merge */ /* |