Merge branch 'cj/p4merge'

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 651e0982cf11380842d401c6b65e98a1e193f669..8106af8fba918b8de82857d40a7f693224c84e81 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 &&
        (