| From 22309546a40d318d6d48f0429b2340a05dea3d08 Mon Sep 17 00:00:00 2001 |
| From: Johannes Schindelin <johannes.schindelin@gmx.de> |
| Date: Mon, 9 Sep 2019 15:43:35 +0200 |
| Subject: t6130/t9350: prepare for stringent Win32 path validation |
| |
| On Windows, file names cannot contain asterisks nor newline characters. |
| In an upcoming commit, we will make this limitation explicit, |
| disallowing even the creation of commits that introduce such file names. |
| |
| However, in the test scripts touched by this patch, we _know_ that those |
| paths won't be checked out, so we _want_ to allow such file names. |
| |
| Happily, the stringent path validation will be guarded via the |
| `core.protectNTFS` flag, so all we need to do is to force that flag off |
| temporarily. |
| |
| Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> |
| (cherry picked from commit 35edce205615c553fdc49bcf10b0c91f061c56c9) |
| Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
| --- |
| t/t6130-pathspec-noglob.sh | 1 + |
| t/t9350-fast-export.sh | 2 +- |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh |
| index 37760233a5..ba7902c9cd 100755 |
| --- a/t/t6130-pathspec-noglob.sh |
| +++ b/t/t6130-pathspec-noglob.sh |
| @@ -10,6 +10,7 @@ test_expect_success 'create commits with glob characters' ' |
| # the name "f*" in the worktree, because it is not allowed |
| # on Windows (the tests below do not depend on the presence |
| # of the file in the worktree) |
| + git config core.protectNTFS false && |
| git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" && |
| test_tick && |
| git commit -m star && |
| diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh |
| index 34124be778..ef1e01805b 100755 |
| --- a/t/t9350-fast-export.sh |
| +++ b/t/t9350-fast-export.sh |
| @@ -421,7 +421,7 @@ test_expect_success 'fast-export quotes pathnames' ' |
| test_config -C crazy-paths core.protectNTFS false && |
| (cd crazy-paths && |
| blob=$(echo foo | git hash-object -w --stdin) && |
| - git update-index --add \ |
| + git -c core.protectNTFS=false update-index --add \ |
| --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \ |
| --cacheinfo 100644 $blob "path with \"quote\"" \ |
| --cacheinfo 100644 $blob "path with \\backslash" \ |
| -- |
| 2.24.0.393.g34dc348eaf |
| |
