undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Ensure consistent usage of mergetool.keepBackup
  git-gui: fix use of undeclared variable diff_empty_count
This commit is contained in:
Shawn O. Pearce 2009-04-08 07:41:13 -07:00
commit 4339d5109c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-gui.sh
View File

@ -722,7 +722,7 @@ proc apply_config {} {
set default_config(branch.autosetupmerge) true set default_config(branch.autosetupmerge) true
set default_config(merge.tool) {} 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.diffstat) true
set default_config(merge.summary) false set default_config(merge.summary) false
set default_config(merge.verbosity) 2 set default_config(merge.verbosity) 2
@ -1131,6 +1131,7 @@ set current_diff_path {}
set is_3way_diff 0 set is_3way_diff 0
set is_conflict_diff 0 set is_conflict_diff 0
set selected_commit_type new set selected_commit_type new
set diff_empty_count 0
set nullid "0000000000000000000000000000000000000000" set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001" set nullid2 "0000000000000000000000000000000000000001"

2
lib/mergetool.tcl
View File

@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {
delete_temp_files $mtool_tmpfiles delete_temp_files $mtool_tmpfiles
ui_status [mc "Merge tool failed."] ui_status [mc "Merge tool failed."]
} else { } 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"
} }