diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-02-03 15:31:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-07 22:27:10 (GMT) |
| commit | 899663f8e452caf158d98d558a41f9b04042b18f (patch) | |
| tree | 0556ca3be43b3686e241105378fe8d1d3feeba1b /t/t3509-cherry-pick-merge-df.sh | |
| parent | 13af8cbd6af3f572a5c6c2fb7adc8fc7c408a3e2 (diff) | |
| download | git-899663f8e452caf158d98d558a41f9b04042b18f.zip git-899663f8e452caf158d98d558a41f9b04042b18f.tar.gz git-899663f8e452caf158d98d558a41f9b04042b18f.tar.bz2 | |
t3509: use unconstrained initial test to setup repository.
The first test did not run on msysGit due to the SYMLINKS constraint and
so subsequent tests failed because the test repository was not initialized.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3509-cherry-pick-merge-df.sh')
| -rwxr-xr-x | t/t3509-cherry-pick-merge-df.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh index 948ca1b..df921d1 100755 --- a/t/t3509-cherry-pick-merge-df.sh +++ b/t/t3509-cherry-pick-merge-df.sh @@ -3,12 +3,14 @@ test_description='Test cherry-pick with directory/file conflicts' . ./test-lib.sh -test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' +test_expect_success 'Initialize repository' ' mkdir a && >a/f && git add a && - git commit -m a && + git commit -m a +' +test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' mkdir b && ln -s ../a b/a && git add b && |