From: Elijah Newren Date: Thu, 21 Mar 2019 13:46:01 GMT Subject: Re: [PATCH] checkout.txt: note about losing staged changes with --merge Message-ID: In-Reply-To: On Wed, Mar 20, 2019 at 7:58 AM Duy Nguyen wrote: > > On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote: > > So, I think we do need something (eventually at least). Would you > > prefer we dropped this patch from Duy and instead made 'checkout -m' > > abort when the index is dirty? > > I have no problem with this. Still scratching my head wondering if > t7201-co.sh has a slightly incorrect setup, or aborting is actually > wrong. You're probably a better person to understand that test case > ;-) It doesn't surprise me at all that some testcases would fail with this change; it's a change of behavior from the previous implementation. However, taking a look at that testcase, it looks like it's not a simple change to make it do something similar because there's at least one other bug that we need to fix first. I'll dig in...though I really want to get my directory-rename-detection-defaults-to-reporting-conflict series updated and sent out first. Since Junio seems to be okay with just taking your doc update for now, hopefully that's not a problem. :-)