Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git

"Ferry Huberts (Pelagic)" [off-list ref] writes:

Ferry Huberts (Pelagic) wrote:

quoted

Junio C Hamano wrote:

quoted

Ferry Huberts [off-list ref] writes:

quoted

In several places merge.keepBackup is used i.s.o.
mergetool.keepBackup. This patch makes it all
consistent for git

A silly question.  The above makes it sound as if both merge.keepBackup
and mergetool.keepBackup are valid, but the latter is preferred, and your
patch makes things consistent even though without it there is nothing
broken per-se.

Is that really is the case?

Otherwise, perhaps the title and the message should read like this:

    Fix misspelled mergetool.keepBackup
    
    In several places mergetool.keepBackup was misspelled as merge.keepBackup.
    
    Signed-off-by: Ferry Huberts [off-list ref]

feel free to change it :-)

Notice that I didn't follow the discussion closely, and I am asking if
this is a "bugfix" or "changing for consistency even though there is no
breakage".

Junio C Hamano wrote:

"Ferry Huberts (Pelagic)" [off-list ref] writes:

quoted

Ferry Huberts (Pelagic) wrote:

quoted

Junio C Hamano wrote:

quoted

Ferry Huberts [off-list ref] writes:

quoted

In several places merge.keepBackup is used i.s.o.
mergetool.keepBackup. This patch makes it all
consistent for git

A silly question.  The above makes it sound as if both merge.keepBackup
and mergetool.keepBackup are valid, but the latter is preferred, and your
patch makes things consistent even though without it there is nothing
broken per-se.

Is that really is the case?

Otherwise, perhaps the title and the message should read like this:

    Fix misspelled mergetool.keepBackup
    
    In several places mergetool.keepBackup was misspelled as merge.keepBackup.
    
    Signed-off-by: Ferry Huberts [off-list ref]

feel free to change it :-)

Notice that I didn't follow the discussion closely, and I am asking if
this is a "bugfix" or "changing for consistency even though there is no
breakage".

it's the latter.
summary: docs say mergetool.keepBackup. code does merge.keepBackup