Re: [PATCH] format-patch: clarify --creation-factor=<factor>

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 28, 2022, 20:59 UTC
Message-ID: <xmqqv8rh9co5.fsf@gitster.g>
In-Reply-To: <220728.867d3xj6s0.gmgdl@evledraar.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

Show 31 quoted lines

>> diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
>> index be797d7a28..e06475abcd 100644
>> --- a/Documentation/git-format-patch.txt
>> +++ b/Documentation/git-format-patch.txt
>> @@ -27,7 +27,7 @@ SYNOPSIS
>>  		   [--[no-]encode-email-headers]
>>  		   [--no-notes | --notes[=<ref>]]
>>  		   [--interdiff=<previous>]
>> -		   [--range-diff=<previous> [--creation-factor=<percent>]]
>> +		   [--range-diff=<previous> [--creation-factor=<factor>]]
>>  		   [--filename-max-length=<n>]
>>  		   [--progress]
>>  		   [<common diff options>]
>> @@ -321,7 +321,7 @@ product of `format-patch` is generated, and they are not passed to
>>  the underlying `range-diff` machinery used to generate the cover-letter
>>  material (this may change in the future).
>>  
>> ---creation-factor=<percent>::
>> +--creation-factor=<factor>::
>>  	Used with `--range-diff`, tweak the heuristic which matches up commits
>>  	between the previous and current series of patches by adjusting the
>>  	creation/deletion cost fudge factor. See linkgit:git-range-diff[1])
>
> Looks good as far as it goes, looks like both of your patches need to
> also tweak this bit though:
>
> 	$ git -P grep 'percentage.*creation' -- '*.c'
> 	builtin/log.c:                      N_("percentage by which creation is weighted")),
> 	builtin/range-diff.c:                       N_("percentage by which creation is weighted")),
>
> Probably just s/percentage/factor/ in for those -h strings?

Thanks for being extra careful.

Eric, I am not sure if the other patch for the range-diff command as a standalone patch is worth it. Perhaps you can help me by submitting a single combined patch to cover the above as well as what we wrote in the two patches, with you marked as the primary author and with Helped-by: that credits Ævar?

Thanks.