I forgot to test the patch on Windows.. Would you please squash this
into js/checkout-untracked-symlink~1 ?
Thanks a lot!
--- 8< ---
From: Johannes Sixt <j6t@xxxxxxxx>
Subject: [PATCH] fixup! Make test case number unique, mark tests with SYMLINKS prerequisite
Signed-off-by: Johannes Sixt <j6t@xxxxxxxx>
---
...ut-overwrite.sh => t2021-checkout-overwrite.sh} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename t/{t2019-checkout-overwrite.sh => t2021-checkout-overwrite.sh} (83%)
diff --git a/t/t2019-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
similarity index 83%
rename from t/t2019-checkout-overwrite.sh
rename to t/t2021-checkout-overwrite.sh
index e4e529d..27db2ad 100755
--- a/t/t2019-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -29,7 +29,7 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' '
test -f a/b
'
-test_expect_success 'create a commit where dir a/b changed to symlink' '
+test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' '
rm -rf a/b && # cleanup if previous test failed
git checkout -f -b symlink start &&
@@ -39,7 +39,7 @@ test_expect_success 'create a commit where dir a/b changed to symlink' '
git commit -m "dir to symlink"
'
-test_expect_failure 'checkout commit with dir must not remove untracked a/b' '
+test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' '
git rm --cached a/b &&
git commit -m "un-track the symlink" &&
--
1.7.4.2.gb816c.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html