Skip to content

Commit

Permalink
t3700-add: do not check working tree file mode without POSIXPERM
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
j6t authored and gitster committed Sep 21, 2016
1 parent b07ad46 commit 40e0dc1
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions t/t3700-add.sh
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,11 @@ 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' '
echo "AM foo4" >expected &&
test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
echo foo >foo4 &&
git add foo4 &&
git add --chmod=+x foo4 &&
git status -s foo4 >actual &&
test_cmp expected actual
! test -x foo4
'

test_expect_success 'no file status change if no pathspec is given' '
Expand Down

0 comments on commit 40e0dc1

Please sign in to comment.