diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-24 14:42:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-24 14:42:50 -0700 |
| commit | 78360b576acb0ee47c90552cb3f976a3c6ba4d6a (patch) | |
| tree | e0128da2b0290c7eba533afc506e312b0676de1c /t/t1020-subdirectory.sh | |
| parent | edbc25c5b377d6fe768cefcc8614cd254a9fc4ff (diff) | |
| parent | 28baf82ea359d9f2579fd3a7e7e2e5e2bd5da2a9 (diff) | |
| download | git-78360b576acb0ee47c90552cb3f976a3c6ba4d6a.tar.gz git-78360b576acb0ee47c90552cb3f976a3c6ba4d6a.tar.xz | |
Merge branch 'js/windows-tests'
* js/windows-tests:
t0060: fix whitespace in "wc -c" invocation
t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
t7004: Use prerequisite tags to skip tests that need gpg
Use prerequisites to skip tests that need unzip
t3700: Skip a test with backslashes in pathspec
Skip tests that require a filesystem that obeys POSIX permissions
t0060: Fix tests on Windows
Use prerequisite tags to skip tests that depend on symbolic links
t9100, t9129: Use prerequisite tags for UTF-8 tests
t5302: Use prerequisite tags to skip 64-bit offset tests
Skip tests that fail if the executable bit is not handled by the filesystem
t3600: Use test prerequisite tags
test-lib: Infrastructure to test and check for prerequisites
t0050: Check whether git init detected symbolic link support correctly
Tests on Windows: $(pwd) must return Windows-style paths
test-lib: Work around missing sum on Windows
test-lib: Work around incompatible sort and find on Windows
Conflicts:
t/t3000-ls-files-others.sh
Diffstat (limited to 't/t1020-subdirectory.sh')
| -rwxr-xr-x | t/t1020-subdirectory.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index fc386ba03..210e594f6 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -126,7 +126,7 @@ test_expect_success 'no file/rev ambiguity check inside a bare repo' ' cd foo.git && git show -s HEAD ' -test_expect_success 'detection should not be fooled by a symlink' ' +test_expect_success SYMLINKS 'detection should not be fooled by a symlink' ' cd "$HERE" && rm -fr foo.git && git clone -s .git another && |