Merge branch 'sb/atomic-push'

diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index b2798feef7316e74584058f594e97af01cb5065e..3fc484e8c3f8d910f02e409baf7bf1d5682b4f2f 100755 (executable)
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -294,7 +294,7 @@ one/a.1
 one/two/a.1
 three/a.1
 EOF
-       git ls-files -o -i --exclude "**/a.1" >actual
+       git ls-files -o -i --exclude "**/a.1" >actual &&
        test_cmp expect actual
 '