mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'en/checkout-mismerge-fix'
Fix a mismerge that happened in 2.22 timeframe. * en/checkout-mismerge-fix: checkout: remove duplicate code
This commit is contained in:
commit
d1a251a1fa
|
@ -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 */
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue