[PATCH v2 1/2] mergetool: honor tempfile configuration when resolving delete conflicts

David Aguilar· Mar 5, 2016, 22:56 UTC · lore

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>
---
v2 uses test.  2/2 is the same as before, and was not sent this round.

 git-mergetool.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Show changes to git-mergetool.sh +10 −1

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9f77e3a..4a9e9ca 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

-- 
2.8.0.rc1.2.g28ba210

Junio C Hamano· Mar 7, 2016, 02:34 UTC · re: David Aguilar · lore

Re: [PATCH v2 1/2] mergetool: honor tempfile configuration when resolving delete conflicts

David Aguilar <davvid@gmail.com> writes:

Show 9 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>
> ---
> v2 uses test.  2/2 is the same as before, and was not sent this round.

Thanks, will queue.

By the way, the fact that 2/2 did not make you realize that your "if" statement was broken in the v1 1/2 patch indicates that the codepath is not covered by the added test, doesn't it? I was sort of expecting an updated patch for 2/2 for this reason...

Show 32 quoted lines

>  git-mergetool.sh | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 9f77e3a..4a9e9ca 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

v2, 2 partsmergetool: honor tempfile configuration when resolving delete conflicts