[PATCH v2 2/2] Ensure consistent usage of mergetool.keepBackup in git-gui
- From
Ferry Huberts <ferry.huberts@pelagic.nl>
- Date
- Apr 9, 2009, 15:45 UTC
- Message-ID
- <7a755d80914df2ebc1a7dc349ed215bae9ffec34.1239291673.git.ferry.huberts@pelagic.nl>
- In-Reply-To
- <f6297e57a23dc3abac2fcedceb00cecde607de02.1239291673.git.ferry.huberts@pelagic.nl>
In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent for git-gui
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> --- git-gui/git-gui.sh | 2 +- git-gui/lib/mergetool.tcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index e018e07..e4e643a 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -699,7 +699,7 @@ proc apply_config {} { 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 diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index eb2b4b5..b7263b3 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl @@ -382,7 +382,7 @@ proc merge_tool_finish {fd} { 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" }
-- 1.6.0.6