diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-06 09:40:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-06 11:57:22 -0700 |
| commit | c22d41d641711879c57299244ae13b6c4a215fee (patch) | |
| tree | 9b44c53d41b31d75cf154b3137f5cd17bd6977af /range-diff.h | |
| parent | Git 2.45 (diff) | |
| download | git-c22d41d641711879c57299244ae13b6c4a215fee.tar.gz git-c22d41d641711879c57299244ae13b6c4a215fee.zip | |
format-patch: run range-diff with larger creation-factor
We see too often that a range-diff added to format-patch output
shows too many "unmatched" patches. This is because the default
value for creation-factor is set to a relatively low value.
It may be justified for other uses (like you have a yet-to-be-sent
new iteration of your series, and compare it against the 'seen'
branch that has an older iteration, probably with the '--left-only'
option, to pick out only your patches while ignoring the others) of
"range-diff" command, but when the command is run as part of the
format-patch, the user _knows_ and expects that the patches in the
old and the new iterations roughly correspond to each other, so we
can and should use a much higher default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'range-diff.h')
| -rw-r--r-- | range-diff.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/range-diff.h b/range-diff.h index 04ffe217be..2f69f6a434 100644 --- a/range-diff.h +++ b/range-diff.h @@ -6,6 +6,12 @@ #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 +/* + * A much higher value than the default, when we KNOW we are comparing + * the same series (e.g., used when format-patch calls range-diff). + */ +#define CREATION_FACTOR_FOR_THE_SAME_SERIES 999 + struct range_diff_options { int creation_factor; unsigned dual_color:1; |
