Re: [PATCH v4 2/4] diff: add option to skip resolving diff statuses
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Feb 28, 2025, 08:29 UTC
- Message-ID
- <Z8Fz5XHtyG_m0_bX@pks.im>
- In-Reply-To
- <20250228002604.3859939-3-jltobler@gmail.com>
On Thu, Feb 27, 2025 at 06:26:02PM -0600, Justin Tobler wrote:
Show 7 quoted lines
> 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?
Patrick