Merge branch 'aw/maint-rebase-i-p-no-ff' into maint

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index a5816d0e4f3744f8ba30666d8bb5828abf6cda51..54520f6fa69bef682e200497c531c9cd7367b9ea 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -402,7 +402,7 @@ test_expect_success 're-init to move gitdir' '
        test -d realgitdir/refs
 '
 
-test_expect_success 're-init to move gitdir symlink' '
+test_expect_success SYMLINKS 're-init to move gitdir symlink' '
        rm -rf newdir realgitdir &&
        git init newdir &&
        (