This is a big milestone. With these modifications, Git's source code
does not only build without warnings in Git for Windows' SDK, but
passes the entire regression test suite.
The patch series contains three different types of patches. First,
there are a couple of real fixes that were triggered by failures in
the regression tests. Then there are a couple of fixes to the
regression tests themselves. And finally, we have to disable a couple
of tests because we simply cannot make them work on Windows.
Relative to v2, this fixes stupid typos that made the tests fail on
Linux, a stupid copy-paste error pointed out by Eric Sunshine,
unnecessary 'printf ""' calls pointed out by Junio Hamano, and I now
use `test_have_prereq !MINGW` consistently, as pointed out by both Eric
and Junio. This time, I also send the patch series with the character
set set (sic!) to UTF-8. Oh, and this time, I also made sure that the
regression tests pass on Windows & Linux alike. Oh, and I also managed not
to forget the fix for t9130 this time.
Johannes Schindelin (17):
mingw: let's use gettext with MSYS2
mingw: do not trust MSYS2's MinGW gettext.sh
Git.pm: stop assuming that absolute paths start with a slash
mingw: prepare the TMPDIR environment variable for shell scripts
mingw: let lstat() fail with errno == ENOTDIR when appropriate
mingw: fix t5601-clone.sh
mingw: accomodate t0060-path-utils for MSYS2
mingw: disable mkfifo-based tests
tests: turn off git-daemon tests if FIFOs are not available
mingw: skip test in t1508 that fails due to path conversion
mingw: fix t9700's assumption about directory separators
mingw: work around pwd issues in the tests
mingw: mark t9100's test cases with appropriate prereqs
mingw: avoid illegal filename in t9118
mingw: handle the missing POSIXPERM prereq in t9124
mingw: skip a test in t9130 that cannot pass on Windows
mingw: do not bother to test funny file names
Karsten Blees (1):
mingw: factor out Windows specific environment setup
Pat Thoyts (1):
Avoid absolute path in t0008
마누엘 (1):
mingw: try to delete target directory before renaming
Makefile | 1 +
compat/mingw.c | 91 +++++++++++++++++++++++++++++------
config.mak.uname | 3 +-
perl/Git.pm | 3 +-
t/lib-git-daemon.sh | 5 ++
t/t0008-ignores.sh | 2 +-
t/t0060-path-utils.sh | 9 ++++
t/t1508-at-combinations.sh | 6 ++-
t/t3300-funny-names.sh | 1 +
t/t3600-rm.sh | 2 +-
t/t3703-add-magic-pathspec.sh | 2 +-
t/t3902-quoted.sh | 1 +
t/t4016-diff-quote.sh | 1 +
t/t4135-apply-weird-filenames.sh | 3 +-
t/t5601-clone.sh | 18 +++----
t/t7800-difftool.sh | 14 +++---
t/t9100-git-svn-basic.sh | 18 +++----
t/t9118-git-svn-funky-branch-names.sh | 12 +++--
t/t9124-git-svn-dcommit-auto-props.sh | 16 +++---
t/t9130-git-svn-authors-file.sh | 2 +-
t/t9200-git-cvsexportcommit.sh | 2 +-
t/t9400-git-cvsserver-server.sh | 6 +--
t/t9401-git-cvsserver-crlf.sh | 6 +--
t/t9402-git-cvsserver-refs.sh | 6 +--
t/t9700/test.pl | 2 +-
t/t9903-bash-prompt.sh | 2 +-
t/test-lib.sh | 2 +-
test-fake-ssh.c | 30 ++++++++++++
28 files changed, 196 insertions(+), 70 deletions(-)
create mode 100644 test-fake-ssh.c
Interdiff vs v2:
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index c59d554..4a9964e 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -35,9 +35,9 @@ test_expect_success 'setup' '
git checkout -b upstream-branch &&
test_commit upstream-one &&
test_commit upstream-two &&
- if ! test_have_prereq MINGW
+ if test_have_prereq !MINGW
then
- git checkout -b @/at-slash
+ git checkout -b @/at-test
fi &&
git checkout -b @@/at-test &&
git checkout -b @at-test &&
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5232ee9..d046d98 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -14,8 +14,7 @@ test_expect_success \
git add -- foo bar baz 'space embedded' -q &&
git commit -m 'add normal files'"
-
-if ! test_have_prereq MINGW && touch -- 'tab embedded' 'newline
+if test_have_prereq !MINGW && touch -- 'tab embedded' 'newline
embedded' 2>/dev/null
then
test_set_prereq FUNNYNAMES
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index aaff784..3ef525a 100755
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -38,7 +38,7 @@ cat >expected <<EOF
add 'sub/foo'
EOF
-if ! test_have_prereq MINGW && mkdir ":" 2>/dev/null
+if test_have_prereq !MINGW && mkdir ":" 2>/dev/null
then
test_set_prereq COLON_DIR
fi
diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh
index 6d6b96d..27cb000 100755
--- a/t/t4135-apply-weird-filenames.sh
+++ b/t/t4135-apply-weird-filenames.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
test_when_finished "rm -f \"tab embedded.txt\"" &&
test_when_finished "rm -f '\''\"quoteembedded\".txt'\''" &&
- if ! test_have_prereq MINGW &&
+ if test_have_prereq !MINGW &&
touch -- "tab embedded.txt" '\''"quoteembedded".txt'\''
then
test_set_prereq FUNNYNAMES
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 2f4272a..c1efb8e 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -5,7 +5,7 @@ test_description=clone
. ./test-lib.sh
X=
-! test_have_prereq MINGW || X=.exe
+test_have_prereq !MINGW || X=.exe
test_expect_success setup '
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 5b32a3b..56acc1e 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -30,7 +30,7 @@ test_expect_success \
echo "deep dir" >dir/a/b/c/d/e/file &&
mkdir bar &&
echo "zzz" >bar/zzz &&
- printf "" | write_script exec.sh &&
+ write_script exec.sh </dev/null &&
svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
) &&
rm -rf import &&
diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh
index 2be0805..9f7231d 100755
--- a/t/t9124-git-svn-dcommit-auto-props.sh
+++ b/t/t9124-git-svn-dcommit-auto-props.sh
@@ -34,7 +34,7 @@ test_expect_success 'enable auto-props config' '
'
test_expect_success 'add files matching auto-props' '
- printf "" | write_script exec1.sh &&
+ write_script exec1.sh </dev/null &&
echo "hello" >hello.txt &&
echo bar >bar &&
git add exec1.sh hello.txt bar &&
@@ -47,7 +47,7 @@ test_expect_success 'disable auto-props config' '
'
test_expect_success 'add files matching disabled auto-props' '
- printf "" | write_script exec2.sh &&
+ write_script exec2.sh </dev/null &&
echo "world" >world.txt &&
echo zot >zot &&
git add exec2.sh world.txt zot &&
@@ -65,7 +65,7 @@ test_expect_success 'check resulting svn repository' '
# Check properties from first commit.
if test_have_prereq POSIXPERM
then
- test -z "$(svn_cmd propget svn:executable exec1.sh)"
+ test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*"
fi &&
test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
"xapplication/x-shellscript" &&
@@ -76,7 +76,7 @@ test_expect_success 'check resulting svn repository' '
# Check properties from second commit.
if test_have_prereq POSIXPERM
then
- test -z "$(svn_cmd propget svn:executable exec2.sh)"
+ test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*"
fi &&
test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index d306b77..4126481 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -91,7 +91,7 @@ test_expect_success 'fetch continues after authors-file is fixed' '
)
'
-test_expect_success 'fresh clone with svn.authors-file in config' '
+test_expect_success !MINGW 'fresh clone with svn.authors-file in config' '
(
rm -r "$GIT_DIR" &&
test x = x"$(git config svn.authorsfile)" &&
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 2ee6564..ffbfa0e 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -67,7 +67,7 @@ repo_with_newline='repo
with
newline'
-if ! test_have_prereq MINGW && mkdir "$repo_with_newline" 2>/dev/null
+if test_have_prereq !MINGW && mkdir "$repo_with_newline" 2>/dev/null
then
test_set_prereq FUNNYNAMES
else
--
2.7.0.windows.1.7.g55a05c8