]> git.ipfire.org Git - thirdparty/git.git/commit
diff: add option to skip resolving diff statuses
authorJustin Tobler <jltobler@gmail.com>
Fri, 28 Feb 2025 21:33:44 +0000 (15:33 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2025 16:17:47 +0000 (08:17 -0800)
commitc8a8e04099a99d6eafbe6e9bb1db3b50996836f8
tree9d8a641fb75126a6f01e0e4dd01176d781536ebd
parent7c67d2a07055150b76e81efa8850221d52705305
diff: add option to skip resolving diff statuses

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.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
diff.h