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

From: David Aguilar <[email-masked]>
Date: Thu, 9 Apr 2009 20:27:32 -0700

Hi

On  0, Ferry Huberts <[email-masked]> wrote:
> In several places merge.keepBackup is used i.s.o.
> mergetool.keepBackup. This patch makes it all
> consistent for git
> 
> Signed-off-by: Ferry Huberts <[email-masked]>
> ---
>  contrib/difftool/git-difftool.txt |    2 +-
>  git-mergetool.sh                  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

You missed the usage of merge.keepBackup in
contrib/difftool/git-difftool-helper.

But.. (for better or worse) the "keep backup" feature
was completely removed from difftool, so patching this for
difftool now isn't very useful.

See 2e8af7e4 which is currently in origin/pu:

	difftool: remove the backup file feature

Also, we just got through a very large round of
mergetool/difftool changes.  The latest version is sitting in
Junio's pu branch.  The "da/difftool" branch's head is
currently pointing at 21d0ba7e.

It might be worth basing your work on top of that series since
that'd make things much easier to merge.

My only other comment is:

Aside from git-gui, there are other scripts out there that
use merge.keepBackup instead of mergetool.keepBackup,
so changing the name of the config variable has negligable
user benefit and will cause problems for people that:

A) already have merge.keepBackup configured and then get
surprised when one day all of a sudden git starts leaving
around these ".orig turds" (technical term, overheard from an
actual user) for no apparent reason even though they had
already configured it to do otherwise in the past, or

B) have written GUIs or scripts that know about
merge.keepBackup.

Aside from the naming, there's little user benefit to this
change in my opinion.

Anyways, just my thoughts.

-- 

	David