summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-09 19:26:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-09 19:26:36 (GMT)
commitd1a251a1fa686dc98f7e3160143dfa809ec1a51d (patch)
tree21721377ebe5950aded37c52b264d4cfe22106a9 /builtin/checkout.c
parente1151704f22ce3de778527047ecfd033e6f1aa83 (diff)
parentacb7da05ac86e81666d65249bfaf39cc125fb145 (diff)
downloadgit-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.zip
git-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.tar.gz
git-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.tar.bz2
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.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8d3ad7c..0a3679e 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 */
/*