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

diff --cc t/t1300-repo-config.sh
Simple merge

diff --cc t/t3000-ls-files-others.sh
index 379d963ceafd64fa989fdfd1bba4e420e479bbf8,b7e03063161337248df90c6e88d2c06bf2377bd9..86291e839942e6842bf1d2b40f2d7f7c1d8d4a9f
--- 1/t/t3000-ls-files-others.sh
--- 2/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@@ -18,8 -17,13 +18,13 @@@ filesystem
  . ./test-lib.sh
  
  date >path0
- ln -s xyzzy path1
+ if test_have_prereq SYMLINKS
+ then
+       ln -s xyzzy path1
+ else
+       date > path1
+ fi
 -mkdir path2 path3
 +mkdir path2 path3 path4
  date >path2/file2
  date >path2-junk
  date >path3/file3

diff --cc t/test-lib.sh
Simple merge