From: Elijah Newren Date: Tue, 09 Mar 2021 22:57:34 GMT Subject: Re: [PATCH v2 7/8] merge-ort: skip rename detection entirely if possible Message-ID: In-Reply-To: <82be59b5-a930-ddca-c694-14f27a9fbae6@gmail.com> On Tue, Mar 9, 2021 at 2:51 PM Derrick Stolee wrote: > > On 3/8/2021 7:09 PM, Elijah Newren via GitGitGadget wrote:> + goto simple_cleanup; /* collect_renames() handles some of cleanup */ > > + > > +cleanup: > > + /* > > + * Free now unneeded filepairs, which would have been handled > > + * in collect_renames() normally but we're about to skip that > > + * code... > > + */ > > "but we're about to skip that code" > > Haven't you skipped it already, earlier in the above part? This should > instead say "but we skipped that code", right? Oh, indeed. I wonder if I moved that comment around and didn't update it. Anyway yes, I'll fix it.