summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-08-12 20:09:12 -0600
committerJunio C Hamano <gitster@pobox.com>2010-08-12 21:38:39 -0700
commitdd5685818bca9b0cadc61a87c6470fa7df227302 (patch)
treecc7190d83c7ac23ad796f91aac290cfe919b9fd7 /t/t3509-cherry-pick-merge-df.sh
parent2fd1ea14056cb630bbf99588b78d7d68f51907ce (diff)
downloadgit-dd5685818bca9b0cadc61a87c6470fa7df227302.tar.gz
Mark tests that use symlinks as needing SYMLINKS prerequisite
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3509-cherry-pick-merge-df.sh')
-rwxr-xr-xt/t3509-cherry-pick-merge-df.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 6e7ef8483f..a5ccdbf8fc 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -3,7 +3,7 @@
test_description='Test cherry-pick with directory/file conflicts'
. ./test-lib.sh
-test_expect_success 'Setup rename across paths each below D/F conflicts' '
+test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
mkdir a &&
>a/f &&
git add a &&
@@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' '
git commit -m f1
'
-test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
+test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
git reset --hard &&
git checkout master^0 &&
git cherry-pick branch