Skip to content

Commit 40e0dc1

Browse files
j6tgitster
authored andcommitted
t3700-add: do not check working tree file mode without POSIXPERM
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. What we care about is that a file added with "--chmod=+x" has executable bit in the index and that "--chmod=+x" (or any other options for that matter) does not muck with working tree files. The former is tested by other existing tests, so let's check the latter more explicitly and only under POSIXPERM prerequisite. Signed-off-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b07ad46 commit 40e0dc1

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

t/t3700-add.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,11 @@ test_expect_success 'git add --chmod=[+-]x changes index with already added file
361361
test_mode_in_index 100644 xfoo3
362362
'
363363

364-
test_expect_success 'file status is changed after git add --chmod=+x' '
365-
echo "AM foo4" >expected &&
364+
test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
366365
echo foo >foo4 &&
367366
git add foo4 &&
368367
git add --chmod=+x foo4 &&
369-
git status -s foo4 >actual &&
370-
test_cmp expected actual
368+
! test -x foo4
371369
'
372370

373371
test_expect_success 'no file status change if no pathspec is given' '

0 commit comments

Comments
 (0)