Re: [PATCH v2] git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mar 8, 2024, 22:12 UTC
Message-ID: <20240308221229.GA1908@szeder.dev>
In-Reply-To: <0fac668f8fc021af9f9c4df5134da59816307ccc.1708423309.git.ps@pks.im>

On Tue, Feb 20, 2024 at 11:08:25AM +0100, Patrick Steinhardt wrote:

Show 106 quoted lines

> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 6a36be1e63..96ae5d5880 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -91,58 +91,67 @@ test_expect_success 'difftool forwards arguments to diff' '
>  	rm for-diff
>  '
>  
> -test_expect_success 'difftool ignores exit code' '
> -	test_config difftool.error.cmd false &&
> -	git difftool -y -t error branch
> -'
> +for opt in '' '--dir-diff'
> +do
> +	test_expect_success "difftool ${opt} ignores exit code" "
> +		test_config difftool.error.cmd false &&
> +		git difftool ${opt} -y -t error branch
> +	"
>  
> -test_expect_success 'difftool forwards exit code with --trust-exit-code' '
> -	test_config difftool.error.cmd false &&
> -	test_must_fail git difftool -y --trust-exit-code -t error branch
> -'
> +	test_expect_success "difftool ${opt} forwards exit code with --trust-exit-code" "
> +		test_config difftool.error.cmd false &&
> +		test_must_fail git difftool ${opt} -y --trust-exit-code -t error branch
> +	"
>  
> -test_expect_success 'difftool forwards exit code with --trust-exit-code for built-ins' '
> -	test_config difftool.vimdiff.path false &&
> -	test_must_fail git difftool -y --trust-exit-code -t vimdiff branch
> -'
> +	test_expect_success "difftool ${opt} forwards exit code with --trust-exit-code for built-ins" "
> +		test_config difftool.vimdiff.path false &&
> +		test_must_fail git difftool ${opt} -y --trust-exit-code -t vimdiff branch
> +	"
>  
> -test_expect_success 'difftool honors difftool.trustExitCode = true' '
> -	test_config difftool.error.cmd false &&
> -	test_config difftool.trustExitCode true &&
> -	test_must_fail git difftool -y -t error branch
> -'
> +	test_expect_success "difftool ${opt} honors difftool.trustExitCode = true" "
> +		test_config difftool.error.cmd false &&
> +		test_config difftool.trustExitCode true &&
> +		test_must_fail git difftool ${opt} -y -t error branch
> +	"
>  
> -test_expect_success 'difftool honors difftool.trustExitCode = false' '
> -	test_config difftool.error.cmd false &&
> -	test_config difftool.trustExitCode false &&
> -	git difftool -y -t error branch
> -'
> +	test_expect_success "difftool ${opt} honors difftool.trustExitCode = false" "
> +		test_config difftool.error.cmd false &&
> +		test_config difftool.trustExitCode false &&
> +		git difftool ${opt} -y -t error branch
> +	"
>  
> -test_expect_success 'difftool ignores exit code with --no-trust-exit-code' '
> -	test_config difftool.error.cmd false &&
> -	test_config difftool.trustExitCode true &&
> -	git difftool -y --no-trust-exit-code -t error branch
> -'
> +	test_expect_success "difftool ${opt} ignores exit code with --no-trust-exit-code" "
> +		test_config difftool.error.cmd false &&
> +		test_config difftool.trustExitCode true &&
> +		git difftool ${opt} -y --no-trust-exit-code -t error branch
> +	"
>  
> -test_expect_success 'difftool stops on error with --trust-exit-code' '
> -	test_when_finished "rm -f for-diff .git/fail-right-file" &&
> -	test_when_finished "git reset -- for-diff" &&
> -	write_script .git/fail-right-file <<-\EOF &&
> -	echo failed
> -	exit 1
> -	EOF
> -	>for-diff &&
> -	git add for-diff &&
> -	test_must_fail git difftool -y --trust-exit-code \
> -		--extcmd .git/fail-right-file branch >actual &&
> -	test_line_count = 1 actual
> -'
> +	test_expect_success "difftool ${opt} stops on error with --trust-exit-code" "
> +		test_when_finished 'rm -f for-diff .git/fail-right-file' &&
> +		test_when_finished 'git reset -- for-diff' &&
> +		write_script .git/fail-right-file <<-\EOF &&
> +		echo failed
> +		exit 1
> +		EOF
> +		>for-diff &&
> +		git add for-diff &&
> +		test_must_fail git difftool ${opt} -y --trust-exit-code \
> +			--extcmd .git/fail-right-file branch >actual &&
> +		test_line_count = 1 actual
> +	"
>  
> -test_expect_success 'difftool honors exit status if command not found' '
> -	test_config difftool.nonexistent.cmd i-dont-exist &&
> -	test_config difftool.trustExitCode false &&
> -	test_must_fail git difftool -y -t nonexistent branch
> -'
> +	test_expect_success "difftool ${opt} honors exit status if command not found" "
> +		test_config difftool.nonexistent.cmd i-dont-exist &&
> +		test_config difftool.trustExitCode false &&
> +		if test "${opt}" = '--dir-diff'

The quoting doesn't quite work here. When $opt is empty, this results in:

  expecting success of 7800.14 'difftool  honors exit status if command not found':
                  test_config difftool.nonexistent.cmd i-dont-exist &&
                  test_config difftool.trustExitCode false &&
                  if test  = '--dir-diff'
                  then
                          expected_code=127
                  else
                          expected_code=128
                  fi &&
                  test_expect_code ${expected_code} git difftool  -y -t nonexistent branch
  
  + test_config difftool.nonexistent.cmd i-dont-exist
  + test_config difftool.trustExitCode false
  + test = --dir-diff
  ./t7800-difftool.sh: 14: test: =: unexpected operator

Show 14 quoted lines

> +		then
> +			expected_code=127
> +		else
> +			expected_code=128
> +		fi &&
> +		test_expect_code \${expected_code} git difftool ${opt} -y -t nonexistent branch
> +	"
> +done
>  
>  test_expect_success 'difftool honors --gui' '
>  	difftool_test_setup &&
> -- 
> 2.44.0-rc1
>