summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2fd1ea1)
raw | patch | inline | side by side (parent: 2fd1ea1)
author | Elijah Newren <newren@gmail.com> | |
Fri, 13 Aug 2010 02:09:12 +0000 (20:09 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 13 Aug 2010 04:38:39 +0000 (21:38 -0700) |
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3509-cherry-pick-merge-df.sh | patch | blob | history | |
t/t9350-fast-export.sh | patch | blob | history |
index 6e7ef8483f5c62ed61515613bca6c4816523e91d..a5ccdbf8fc22efb03891c6b5fa2c9715350a191f 100755 (executable)
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 &&
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
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 1ee1461c9bb38750b45e11ff9e5c72b1a6acf1db..27aea5c165d2fac9cb88409a062b8bb86862a5d3 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
-test_expect_success 'directory becomes symlink' '
+test_expect_success SYMLINKS 'directory becomes symlink' '
git init dirtosymlink &&
git init result &&
(