git-gui: Ensure consistent usage of mergetool.keepBackup

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

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index b70e1598dc0fc0029bf4f4b889478efa57e3d6b4..5404f7e4b523290dd4a15973aa46dbbe806af1c2 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -699,7 +699,7 @@ proc apply_config {} {
 
 set default_config(branch.autosetupmerge) true
 set default_config(merge.tool) {}
 
 set default_config(branch.autosetupmerge) true
 set default_config(merge.tool) {}

-set default_config(merge.keepbackup) true
+set default_config(mergetool.keepbackup) true

 set default_config(merge.diffstat) true
 set default_config(merge.summary) false
 set default_config(merge.verbosity) 2
 set default_config(merge.diffstat) true
 set default_config(merge.summary) false
 set default_config(merge.verbosity) 2

diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 3e1b42beb0d05f12a6fe7913aff14091cecac32c..3fe90e697002baaa1c5fa8df4c3d3eae199b062d 100644 (file)
--- a/lib/mergetool.tcl
+++ b/lib/mergetool.tcl
@@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {
                delete_temp_files $mtool_tmpfiles
                ui_status [mc "Merge tool failed."]
        } else {
                delete_temp_files $mtool_tmpfiles
                ui_status [mc "Merge tool failed."]
        } else {

-               if {[is_config_true merge.keepbackup]} {
+               if {[is_config_true mergetool.keepbackup]} {

                        file rename -force -- $backup "$mtool_target.orig"
                }
 
                        file rename -force -- $backup "$mtool_target.orig"
                }