Merge branch 'ja/directory-attrs' into maint

diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
index 7cfa2d6287ff7c6c0fc7fbc2e86fd622bbc901ce..d173acde0f2c44031003144fda9770f4b1e726b4 100755 (executable)
--- a/t/t4130-apply-criss-cross-rename.sh
+++ b/t/t4130-apply-criss-cross-rename.sh
@@ -44,7 +44,7 @@ test_expect_success 'criss-cross rename' '
        git reset --hard &&
        mv file1 tmp &&
        mv file2 file1 &&
-       mv file3 file2
+       mv file3 file2 &&
        mv tmp file3 &&
        cp file1 file1-swapped &&
        cp file2 file2-swapped &&