From: Elijah Newren Date: Wed, 31 Aug 2022 07:37:23 GMT Subject: Re: Bug in 'git log --remerge-diff' when used with '--find-object' and '--submodule=log|diff' Message-ID: In-Reply-To: On Mon, Aug 29, 2022 at 7:51 PM Elijah Newren wrote: > > On Mon, Aug 29, 2022 at 9:36 AM Philippe Blain > wrote: > > > > Hi Elijah, > > > > Le 2022-08-24 à 03:36, Elijah Newren a écrit : > > > Hi Philippe, > > > > > > On Mon, Aug 22, 2022 at 4:58 PM Philippe Blain > > > wrote: > > >> > > >> Hi Elijah, > > >> > > >> I found two bugs in '--remerge-diff' when combined with both '--find-object' and > > >> '--submodule=log|diff'. I don't know if they have the same cause. [...] > > >> This artificial example reproduces the bug: [...] > > > Thanks for the report, and the steps to reproduce. Very helpful. > > > > > > After some digging, it appears the remerge-diff headers are > > > misinterpreted by the submodule code. [...] > > > > Thanks for digging into this. > > From what I understand in the case of a remerge-diff, both modes are all-zero, and this is > > not expected by the submodule diff code. Were you planning to submit a proper > > patch ? I could get to it eventually, but not before mid/end of September... > > I intend to submit a proper patch; I've just been busy. I have some patches that I think fix all the --remerge-diff issues; see https://lore.kernel.org/git/pull.1342.git.1661926908.gitgitgadget@gmail.com/ I looked briefly at the same issue affecting --cc and -c, but only enough to find it appears to have a different codepath and I don't see any obvious similar fixes for it.