diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:58 +0900 |
| commit | f35a1d75b5ecefaef7b1a8ec55543c82883df82f (patch) | |
| tree | 5f7553c5615b158b3e569d9a9b86be820aa54e72 | |
| parent | 8f3d48e14e7f15dd59592754416764db3060873d (diff) | |
| parent | 57ea241ef09979560b7512bb5115e2a7b3914fcb (diff) | |
| download | git-f35a1d75b5ecefaef7b1a8ec55543c82883df82f.tar.gz git-f35a1d75b5ecefaef7b1a8ec55543c82883df82f.tar.xz | |
Merge branch 'rs/t3700-clean-leftover' into maint
A test fix.
* rs/t3700-clean-leftover:
t3700: fix broken test under !POSIXPERM
| -rwxr-xr-x | t/t3700-add.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f3a4b4a91..0aae21d69 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -356,6 +356,7 @@ test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' ' test_expect_success 'git add --chmod=[+-]x changes index with already added file' ' rm -f foo3 xfoo3 && + git reset --hard && echo foo >foo3 && git add foo3 && git add --chmod=+x foo3 && |