The t1300 and t9115 tests regressed on Windows. These patches fix that.
Johannes Schindelin (4):
config --show-origin: report paths with forward slashes
Make t1300-repo-config resilient to being run via 'sh -x'
t1300: fix the new --show-origin tests on Windows
mingw: skip some tests in t9115 due to file name issues
compat/mingw.h | 6 ++++++
path.c | 3 +++
t/t1300-repo-config.sh | 18 +++++++++---------
t/t9115-git-svn-dcommit-funky-renames.sh | 4 ++--
4 files changed, 20 insertions(+), 11 deletions(-)
Interdiff vs v1:
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 18eb769..a37ebb2 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -700,12 +700,12 @@ test_expect_success 'invalid unit' '
git config aninvalid.unit >actual &&
test_cmp expect actual &&
test_must_fail git config --int --get aninvalid.unit 2>actual &&
- grep "^fatal: bad numeric config value .1auto. for .aninvalid.unit. in
file .git/config: invalid unit$" actual
+ test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in
file .git/config: invalid unit" actual
'
test_expect_success 'invalid stdin config' '
echo "[broken" | test_must_fail git config --list --file - >output 2>&1
&&
- grep "^fatal: bad config line 1 in standard input $" output
+ test_i18ngrep "bad config line 1 in standard input" output
'
cat > expect << EOF
@@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing
permissions' '
"die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
'
+! test_have_prereq MINGW ||
+HOME="$(pwd)" # convert to Windows path
+
test_expect_success 'set up --show-origin tests' '
INCLUDE_DIR="$HOME/include" &&
mkdir -p "$INCLUDE_DIR" &&
@@ -1232,14 +1235,6 @@ test_expect_success 'set up --show-origin tests' '
EOF
'
-if test_have_prereq MINGW
-then
- # convert to Windows paths
- HOME="$(pwd)"
- INCLUDE_DIR="$HOME/include"
- export HOME INCLUDE_DIR
- git config -f .gitconfig include.path "$INCLUDE_DIR/absolute.include"
-fi
test_expect_success '--show-origin with --list' '
cat >expect <<-EOF &&
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh
b/t/t9115-git-svn-dcommit-funky-renames.sh
index 864395e..a87d3d3 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -93,7 +93,7 @@ test_expect_success 'git svn rebase works inside a
fresh-cloned repository' '
# > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
# > "Private use area") when creating or accessing files.
prepare_a_utf8_locale
-test_expect_success UTF8,!MINGW 'svn.pathnameencoding=cp932 new file on
dcommit' '
+test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932
new file on dcommit' '
LC_ALL=$a_utf8_locale &&
export LC_ALL &&
neq=$(printf "\201\202") &&
@@ -105,7 +105,7 @@ test_expect_success UTF8,!MINGW
'svn.pathnameencoding=cp932 new file on dcommit'
'
# See the comment on the above test for setting of LC_ALL.
-test_expect_success !MINGW 'svn.pathnameencoding=cp932 rename on dcommit' '
+test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932
rename on dcommit' '
LC_ALL=$a_utf8_locale &&
export LC_ALL &&
inf=$(printf "\201\207") &&
--
2.7.4.windows.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
