From: Phillip Wood Date: Wed, 19 Feb 2020 19:33:15 GMT Subject: Re: [PATCH] t3424: new rebase testcase documenting a stat-dirty-like failure Message-ID: <73f32ad3-204e-09a8-d424-5a3534358676@gmail.com> In-Reply-To: Hi Elijah On 19/02/2020 16:00, Elijah Newren wrote: > Hi Phillip, > >> >> HEAD is now at abd8fe3 side1 >> Rebasing (1/2) # picking commit1 >> DS mtime, mode before merge 1582109854, 120000 >> DS mtime, mode after merge 0, 120000 >> Rebasing (2/2) # picking commit2 >> DS mtime, mode before merge 0, 120000 >> error: Your local changes to the following files would be overwritten by >> merge: >> DS >> >> So it looks like the problem is that when we pick commit1 we don't >> update the index entry for DS properly in merge_trees() >> >> Best Wishes >> >> Phillip > > Oh, indeed, so this was my bug. Thanks for jumping in and > investigating; I probably should have found that lead but I just > didn't. Anyway, with your extra information I dug around for a bit > and I think I found the fix. I'll post it soon. I'm glad that was helpful, thanks for fixing the bug Phillip