Re: [PATCH v4 2/4] diff: add option to skip resolving diff statuses
- From
Justin Tobler <jltobler@gmail.com>
- Date
- Feb 28, 2025, 17:10 UTC
- Message-ID
- <r33nifirglhjiqhwxa37fuujvzoxefzs7g5ovjdtx43d6wu76m@mca3i66mgmtt>
- In-Reply-To
- <Z8Fz5XHtyG_m0_bX@pks.im>
On 25/02/28 09:29AM, Patrick Steinhardt wrote:
Show 13 quoted lines
> On Thu, Feb 27, 2025 at 06:26:02PM -0600, Justin Tobler wrote: > > By default, `diffcore_std()` resolves the statuses for queued diff file > > pairs by calling `diff_resolve_rename_copy()`. If status information is > > already manually set, invoking `diffcore_std()` may change the status > > value. > > > > Introduce the `skip_resolving_statuses` diff option that prevents > > `diffcore_std()` from resolving file pair statuses when enabled. > > You mentioned to me that there was another user that basically abused > `found_follow` to skip over this, which seems to be in "tree-diff.c". > Would it make sense to convert that user to use the new mechanism, as > well, so that we don't mix up options and state?
I was mixed up with something else and mistaken. There is only the one expected existing user of the `found_follow` option. Apoligies for any confusion.
-Justin