Re: [PATCH 03/15] read-tree tests: check "diff-files" exit code on failure

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 2, 2022, 23:06 UTC
Message-ID: <xmqqk0dcgdin.fsf@gitster.g>
In-Reply-To: <patch-03.15-5f02e30d1ab-20220302T171755Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

Show 9 quoted lines

>  check_cache_at () {
> -	clean_if_empty=$(git diff-files -- "$1")
> +	git diff-files -- "$1" >out &&
> +	clean_if_empty=$(cat out) &&
>  	case "$clean_if_empty" in
>  	'')  echo "$1: clean" ;;
>  	?*)  echo "$1: dirty" ;;
> -	esac
> +	esac &&

Good to see such an attention to the detail.

Show 30 quoted lines

>  	case "$2,$clean_if_empty" in
>  	clean,)		:     ;;
>  	clean,?*)	false ;;
> diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
> index ca5c5510c73..46cbd5514a6 100755
> --- a/t/t1002-read-tree-m-u-2way.sh
> +++ b/t/t1002-read-tree-m-u-2way.sh
> @@ -9,7 +9,6 @@ This is identical to t1001, but uses -u to update the work tree as well.
>  
>  '
>  
> -TEST_PASSES_SANITIZE_LEAK=true
>  . ./test-lib.sh
>  . "$TEST_DIRECTORY"/lib-read-tree.sh
>  
> @@ -23,11 +22,12 @@ compare_change () {
>  }
>  
>  check_cache_at () {
> -	clean_if_empty=$(git diff-files -- "$1")
> +	git diff-files -- "$1" >out &&
> +	clean_if_empty=$(cat out) &&
>  	case "$clean_if_empty" in
>  	'')  echo "$1: clean" ;;
>  	?*)  echo "$1: dirty" ;;
> -	esac
> +	esac &&
>  	case "$2,$clean_if_empty" in
>  	clean,)		:     ;;
>  	clean,?*)	false ;;