Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Sep 20, 2016, 19:34 UTC
Message-ID: <20160920193444.GG8254@hank>
In-Reply-To: <5effaf36-d017-3ff1-1de1-d9b303c04f23@kdbg.org>

Hi Johannes,

On 09/20, Johannes Sixt wrote:

> A recently introduced test checks the result of 'git status' after
> setting the executable bit on a file. This check does not yield the
> expected result when the filesystem does not support the executable bit
> (and core.filemode is false). Skip the test case.

Thanks for cleaning up my mess.  The patch looks correct to me.

> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  I am surprised that add --chmod=+x changes only the index, but not
>  the file on disk!?!

I *think* --chmod is mainly thought of as a convenience for git users on a filesystem that doesn't have an executable flag. So it was introduced this way as the permissions on the file system don't matter in that case. A change of that behaviour may make sense for this though.

Show 19 quoted lines

>  t/t3700-add.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/t/t3700-add.sh b/t/t3700-add.sh
> index 16ab2da..13e0dd2 100755
> --- a/t/t3700-add.sh
> +++ b/t/t3700-add.sh
> @@ -361,7 +361,7 @@ test_expect_success 'git add --chmod=[+-]x changes index with already added file
>  	test_mode_in_index 100644 xfoo3
>  '
>  
> -test_expect_success 'file status is changed after git add --chmod=+x' '
> +test_expect_success POSIXPERM 'file status is changed after git add --chmod=+x' '
>  	echo "AM foo4" >expected &&
>  	echo foo >foo4 &&
>  	git add foo4 &&
> -- 
> 2.10.0.85.gea34e30
>

-- 
Thomas