From: Elijah Newren Date: Thu, 15 Aug 2019 22:03:03 +0000 (-0700) Subject: checkout: remove duplicate code X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/acb7da05ac86e81666d65249bfaf39cc125fb145?ds=sidebyside checkout: remove duplicate code Both commit a7256debd4b6 ("checkout.txt: note about losing staged changes with --merge", 2019-03-19) from nd/checkout-m-doc-update and commit 6eff409e8a76 ("checkout: prevent losing staged changes with --merge", 2019-03-22) from nd/checkout-m were included in git.git despite the fact that the latter was meant to be v2 of the former. The merge of these two topics resulted in a redundant chunk of code; remove it. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/builtin/checkout.c b/builtin/checkout.c index ffa776c6e1..d75f69e7e1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -745,13 +745,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 */ /*