{"thread":{"id":"18767","subject":"[[PATCH 1/1] Ensure consistent usage of mergetool.keepBackup","startedAt":"2009-04-07T15:33:35Z","lastAt":"2009-04-09T15:30:33Z","messageCount":2,"participants":["Ferry Huberts","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"110713","messageId":"cfb81044a29899f9dd0b46f10447243632c50c94.1239108064.git.ferry.huberts@pelagic.nl","threadId":"18767","inReplyTo":null,"subject":"[[PATCH 1/1] Ensure consistent usage of mergetool.keepBackup","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-07T15:33:35Z","receivedAt":"2009-04-07T15:33:35Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"In several places merge.keepBackup is used i.s.o.\nmergetool.keepBackup. This patch makes it all\nconsistent.\n\nSigned-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>\n---\nThis patch is rebased on v1.6.2.2\n\n contrib/difftool/git-difftool.txt |    2 +-\n git-gui/git-gui.sh                |    2 +-\n git-gui/lib/mergetool.tcl         |    2 +-\n git-mergetool.sh                  |    2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt\nindex 6e2610c..ca7482a 100644\n--- a/contrib/difftool/git-difftool.txt\n+++ b/contrib/difftool/git-difftool.txt\n@@ -66,7 +66,7 @@ merge.tool::\n +\n See the `--tool=<tool>` option above for more details.\n \n-merge.keepBackup::\n+mergetool.keepBackup::\n \tThe original, unedited file content can be saved to a file with\n \ta `.orig` extension.  Defaults to `true` (i.e. keep the backup files).\n \ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex e018e07..e4e643a 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -699,7 +699,7 @@ proc apply_config {} {\n \n set default_config(branch.autosetupmerge) true\n set default_config(merge.tool) {}\n-set default_config(merge.keepbackup) true\n+set default_config(mergetool.keepbackup) true\n set default_config(merge.diffstat) true\n set default_config(merge.summary) false\n set default_config(merge.verbosity) 2\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex eb2b4b5..b7263b3 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {\n \t\tdelete_temp_files $mtool_tmpfiles\n \t\tui_status [mc \"Merge tool failed.\"]\n \t} else {\n-\t\tif {[is_config_true merge.keepbackup]} {\n+\t\tif {[is_config_true mergetool.keepbackup]} {\n \t\t\tfile rename -force -- $backup \"$mtool_target.orig\"\n \t\t}\n \ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 87fa88a..1455bd9 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -430,7 +430,7 @@ else\n \n     init_merge_tool_path \"$merge_tool\"\n \n-    merge_keep_backup=\"$(git config --bool merge.keepBackup || echo true)\"\n+    merge_keep_backup=\"$(git config --bool mergetool.keepBackup || echo true)\"\n     merge_keep_temporaries=\"$(git config --bool mergetool.keepTemporaries || echo false)\"\n \n     if test -z \"$merge_tool_cmd\" && ! type \"$merge_tool_path\" > /dev/null 2>&1; then\n-- \n1.6.0.6\n"},{"id":"110922","messageId":"20090409153033.GN23604@spearce.org","threadId":"18767","inReplyTo":"cfb81044a29899f9dd0b46f10447243632c50c94.1239108064.git.ferry.huberts@pelagic.nl","subject":"Re: RESEND [PATCH 1/1] Ensure consistent usage of mergetool.keepBackup","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-04-09T15:30:33Z","receivedAt":"2009-04-09T15:30:33Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Ferry Huberts <ferry.huberts@pelagic.nl> wrote:\n> In several places merge.keepBackup is used i.s.o.\n> mergetool.keepBackup. This patch makes it all\n> consistent.\n> \n> Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>\n> ---\n> This patch is rebased on v1.6.2.2\n> \n>  contrib/difftool/git-difftool.txt |    2 +-\n>  git-gui/git-gui.sh                |    2 +-\n>  git-gui/lib/mergetool.tcl         |    2 +-\n>  git-mergetool.sh                  |    2 +-\n>  4 files changed, 4 insertions(+), 4 deletions(-)\n\ngit-gui patches should be sent by themselves as they apply to\ngit-gui.git which is then merged into git.git every so often.\n\nYesterday I broke the git-gui part out by hand and applied it to\ngit-gui.git.  You should break this patch down and send Junio the\nnon-git-gui half so he can more easily apply it to git.git.\n \n-- \nShawn.\n"}]}