As afb31ad9 (t1010: fix unnoticed failure on Windows, 2021-12-11)
said:
On Microsoft Windows, a directory name should never end with a period.
Quoting from Microsoft documentation[1]:
Do not end a file or directory name with a space or a period.
Although the underlying file system may support such names, the
Windows shell and user interface does not.
[1]: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
and the condition addressed by this change is exactly that. If the
platform is unable to properly create these sample patches about a
file that lives in a directory whose name ends with a SP, there is
no point testing how "git apply" behaves there on the filesystem.
Even though the ultimate purpose of "git apply" is to apply a patch
and to update the filesystem entities, this particular test is
mainly about parsing a patch on a funny pathname correctly, and even
on a system that is incapable of checking out the resulting state
correctly on its filesystem, at least the parsing can and should work
fine. Rewrite the test to work inside the index without touching the
filesystem.
Helped-by: Jeff King <peff@xxxxxxxx>
Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
Junio C Hamano <gitster@xxxxxxxxx> writes:
> As this test _is_, unlike the cited patch that was not about a
> directory with a funny name, about parsing a patch and applying it
> to a path with a directory with a funny name, I am tempted to keep
> the test with the filesystem, instead of replacing it with the one
> using the "--cached" that Peff suggested. I am _also_ tempted to
> add that "--cached" thing (instead of replacing), though.
So, I changed my mind and just took Peff's "--cached" approach
with no filesystem-based test. format-patch --range-diff just
didn't understand that the single patch corresponds to the only
one patch in the older "series", and I had to force it to match
them with --creation-factor=999 in a separate invocation. The
patch text has changed too much so it is useless, but the log
message change may be easier to see in the range-diff.
1: 7e84d0f64f ! 1: a107f21ea2 t4126: make sure a directory with SP at the end is usable
@@ Commit message
and the condition addressed by this change is exactly that. If the
platform is unable to properly create these sample patches about a
file that lives in a directory whose name ends with a SP, there is
- no point testing how "git apply" behaves there.
+ no point testing how "git apply" behaves there on the filesystem.
- Protect the test that involves the filesystem access with a
- prerequisite, and perform the same test only within the index
- everywhere.
+ Even though the ultimate purpose of "git apply" is to apply a patch
+ and to update the filesystem entities, this particular test is
+ mainly about parsing a patch on a funny pathname correctly, and even
+ on a system that is incapable of checking out the resulting state
+ correctly on its filesystem, at least the parsing can and should work
+ fine. Rewrite the test to work inside the index without touching the
+ filesystem.
Helped-by: Jeff King <peff@xxxxxxxx>
Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
@@ t/t4126-apply-empty.sh: test_expect_success 'apply --index create' '
'
-test_expect_success 'apply with no-contents and a funny pathname' '
-+test_expect_success 'setup patches in dir ending in SP' '
-+ test_when_finished "rm -fr \"funny \"" &&
- mkdir "funny " &&
- >"funny /empty" &&
- git add "funny /empty" &&
+- mkdir "funny " &&
+- >"funny /empty" &&
+- git add "funny /empty" &&
- git diff HEAD "funny /" >sample.patch &&
- git diff -R HEAD "funny /" >elpmas.patch &&
-+ git diff HEAD -- "funny /" >sample.patch &&
-+ git diff -R HEAD -- "funny /" >elpmas.patch &&
++test_expect_success 'parsing a patch with no-contents and a funny pathname' '
git reset --hard &&
- rm -fr "funny " &&
-+
-+ if grep "a/funny /empty b/funny /empty" sample.patch &&
-+ grep "b/funny /empty a/funny /empty" elpmas.patch
-+ then
-+ test_set_prereq DIR_ENDS_WITH_SP
-+ else
-+ # Win test???
-+ ls -l
-+ fi
-+'
-+
-+test_expect_success DIR_ENDS_WITH_SP 'apply with no-contents and a funny pathname' '
-+ test_when_finished "rm -fr \"funny \"" &&
-
- git apply --stat --check --apply sample.patch &&
- test_must_be_empty "funny /empty" &&
-@@ t/t4126-apply-empty.sh: test_expect_success 'apply with no-contents and a funny pathname' '
- test_path_is_missing "funny /empty"
- '
-
-+test_expect_success 'parsing a patch with no-contents and a funny pathname' '
-+ git reset --hard &&
-+
+ empty_blob=$(test_oid empty_blob) &&
-+ echo $empty_blob >expect &&
-+
++ echo "$empty_blob" >expect &&
+
+- git apply --stat --check --apply sample.patch &&
+- test_must_be_empty "funny /empty" &&
+ git update-index --add --cacheinfo "100644,$empty_blob,funny /empty" &&
+ git diff --cached HEAD -- "funny /" >sample.patch &&
+ git diff --cached -R HEAD -- "funny /" >elpmas.patch &&
+ git reset &&
-+
+
+- git apply --stat --check --apply elpmas.patch &&
+- test_path_is_missing "funny /empty" &&
+ git apply --cached --stat --check --apply sample.patch &&
+ git rev-parse --verify ":funny /empty" >actual &&
+ test_cmp expect actual &&
-+
+
+- git apply -R --stat --check --apply elpmas.patch &&
+- test_must_be_empty "funny /empty" &&
+ git apply --cached --stat --check --apply elpmas.patch &&
+ test_must_fail git rev-parse --verify ":funny /empty" &&
-+
+
+- git apply -R --stat --check --apply sample.patch &&
+- test_path_is_missing "funny /empty"
+ git apply -R --cached --stat --check --apply elpmas.patch &&
+ git rev-parse --verify ":funny /empty" >actual &&
+ test_cmp expect actual &&
+
+ git apply -R --cached --stat --check --apply sample.patch &&
+ test_must_fail git rev-parse --verify ":funny /empty"
-+'
-+
+ '
+
test_done
t/t4126-apply-empty.sh | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index eaf0c5304a..2462cdf904 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -66,26 +66,29 @@ test_expect_success 'apply --index create' '
git diff --exit-code
'
-test_expect_success 'apply with no-contents and a funny pathname' '
- mkdir "funny " &&
- >"funny /empty" &&
- git add "funny /empty" &&
- git diff HEAD "funny /" >sample.patch &&
- git diff -R HEAD "funny /" >elpmas.patch &&
+test_expect_success 'parsing a patch with no-contents and a funny pathname' '
git reset --hard &&
- rm -fr "funny " &&
+ empty_blob=$(test_oid empty_blob) &&
+ echo "$empty_blob" >expect &&
- git apply --stat --check --apply sample.patch &&
- test_must_be_empty "funny /empty" &&
+ git update-index --add --cacheinfo "100644,$empty_blob,funny /empty" &&
+ git diff --cached HEAD -- "funny /" >sample.patch &&
+ git diff --cached -R HEAD -- "funny /" >elpmas.patch &&
+ git reset &&
- git apply --stat --check --apply elpmas.patch &&
- test_path_is_missing "funny /empty" &&
+ git apply --cached --stat --check --apply sample.patch &&
+ git rev-parse --verify ":funny /empty" >actual &&
+ test_cmp expect actual &&
- git apply -R --stat --check --apply elpmas.patch &&
- test_must_be_empty "funny /empty" &&
+ git apply --cached --stat --check --apply elpmas.patch &&
+ test_must_fail git rev-parse --verify ":funny /empty" &&
- git apply -R --stat --check --apply sample.patch &&
- test_path_is_missing "funny /empty"
+ git apply -R --cached --stat --check --apply elpmas.patch &&
+ git rev-parse --verify ":funny /empty" >actual &&
+ test_cmp expect actual &&
+
+ git apply -R --cached --stat --check --apply sample.patch &&
+ test_must_fail git rev-parse --verify ":funny /empty"
'
test_done
--
2.44.0-368-gc75fd8d815
