diff options
| author | David Aguilar <davvid@gmail.com> | 2016-03-09 23:13:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 14:07:57 -0800 |
| commit | a2986045e3da24c850da03eaf2f2e2a56f8d4fff (patch) | |
| tree | 8b2750e30dceb0fcd1b28522c7923a6397c12e74 /git-mergetool.sh | |
| parent | faaab8d571633fc8d98f58f02862f1d0bfa988f7 (diff) | |
| download | git-a2986045e3da24c850da03eaf2f2e2a56f8d4fff.tar.gz | |
mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict
Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.
This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index b06ae78739..f67bab55e8 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -126,7 +126,12 @@ resolve_deleted_merge () { case "$ans" in [mMcC]*) git add -- "$MERGED" - cleanup_temp_files --save-backup + if test "$merge_keep_backup" = "true" + then + cleanup_temp_files --save-backup + else + cleanup_temp_files + fi return 0 ;; [dD]*) @@ -135,6 +140,10 @@ resolve_deleted_merge () { return 0 ;; [aA]*) + if test "$merge_keep_temporaries" = "false" + then + cleanup_temp_files + fi return 1 ;; esac |