Re: [PATCHv3 1/5] t7406: simplify by using diff --name-only instead of diff --raw

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

 



Elijah Newren <newren@xxxxxxxxx> writes:

> We can get rid of some quoted tabs and make a few tests slightly easier
> to read and edit by just asking for the names of the files modified,
> since that's all these tests were interested in anyway.

Technically the quoted tab was making sure that we do not mistake
"subsubmodule" (if existed) as "submodule" we seek, so a faithful
replacement would be to find "^submodule", and "^submodule$" would
be an improvement.  But we do not have paths with confusing names in
these tests, so we can leave it as-is, I guess.

I think 0/5 should fix the real bug you are deliberately keeping in
this patch, from the point of view of organization.


> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
>  t/t7406-submodule-update.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
> index f604ef7a72..e2405c96b5 100755
> --- a/t/t7406-submodule-update.sh
> +++ b/t/t7406-submodule-update.sh
> @@ -579,9 +579,9 @@ test_expect_success 'submodule update - update=none in .git/config' '
>  	  git checkout master &&
>  	  compare_head
>  	 ) &&
> -	 git diff --raw | grep "	submodule" &&
> +	 git diff --name-only | grep submodule &&
>  	 git submodule update &&
> -	 git diff --raw | grep "	submodule" &&
> +	 git diff --name-only | grep submodule &&
>  	 (cd submodule &&
>  	  compare_head
>  	 ) &&
> @@ -597,9 +597,9 @@ test_expect_success 'submodule update - update=none in .git/config but --checkou
>  	  git checkout master &&
>  	  compare_head
>  	 ) &&
> -	 git diff --raw | grep "	submodule" &&
> +	 git diff --name-only | grep submodule &&
>  	 git submodule update --checkout &&
> -	 test_must_fail git diff --raw \| grep "	submodule" &&
> +	 test_must_fail git diff --name-only \| grep submodule &&
>  	 (cd submodule &&
>  	  test_must_fail compare_head
>  	 ) &&



[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