git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
David Aguilar <davvid@gmail.com>
Date
Apr 10, 2009, 03:27 UTC
Message-ID
<20090410032731.GA1545@gmail.com>
In-Reply-To
<f6297e57a23dc3abac2fcedceb00cecde607de02.1239291673.git.ferry.huberts@pelagic.nl>
Hi
On  0, Ferry Huberts <ferry.huberts@pelagic.nl> wrote:
Show 9 quoted lines
> 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 <ferry.huberts@pelagic.nl>
> ---
>  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
Previous: Ferry HubertsNext: Ferry Huberts (Pelagic)
Message 3 of 9 in “Ensure consistent usage of mergetool.keepBackup in git”
  1. 1/2 Ensure consistent usage of mergetool.keepBackup in gitFerry Huberts, Apr 9, 2009
  2. 2/2 Ensure consistent usage of mergetool.keepBackup in git-guiFerry Huberts, Apr 9, 2009
  3. David AguilarApr 10, 2009
  4. Ferry Huberts (Pelagic)Apr 10, 2009
  5. David AguilarApr 10, 2009
  6. David AguilarApr 10, 2009
  7. Ferry Huberts (Pelagic)Apr 10, 2009
  8. Markus HeidelbergApr 10, 2009
  9. Charles BaileyApr 11, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.