Re: [PATCH 1/2] mergetool: honor tempfile configuration when resolving delete conflicts
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 5, 2016, 07:21 UTC
- Message-ID
- <xmqqy49xwft7.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1457159948-10645-1-git-send-email-davvid@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 21 quoted lines
> 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>
> ---
> git-mergetool.sh | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 9f77e3a..615265d 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 "$merge_keep_backup" = "true"The command run as the "if" condition is probably "test", like in the other hunk?
Show 19 quoted lines
> + 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