]> granicus.if.org Git - git/commit
checkout: remove duplicate code
authorElijah Newren <newren@gmail.com>
Thu, 15 Aug 2019 22:03:03 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Aug 2019 16:58:00 +0000 (09:58 -0700)
commitacb7da05ac86e81666d65249bfaf39cc125fb145
treed0de10963ea7acb22a4572962082bc5972506acc
parent4a3ed2bec6031545aea38db10e443a979951346f
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c