Re: [PATCH] t7800-difftool: don't accidentally match tmp dirs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



SZEDER Gábor <szeder.dev@xxxxxxxxx> writes:

> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index a578b35761..fe02fe1688 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -439,73 +439,104 @@ run_dir_diff_test () {
>  }
>  
>  run_dir_diff_test 'difftool -d' '
> +	cat >expect <<-\EOF &&
> +	file
> +	file2
> +
> +	file
> +	file2
> +	sub
> +	EOF
>  	git difftool -d $symlinks --extcmd ls branch >output &&
> -	grep sub output &&
> -	grep file output
> +	grep -v ^/ output >actual &&

This unfortunately would not catch full paths on certain platforms.

See https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
for an example X-<.

> +	test_cmp expect actual
>  '




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux