Junio C Hamano <gitster@xxxxxxxxx> writes: > diff --git c/t/t4126-apply-empty.sh w/t/t4126-apply-empty.sh > index ece9fae207..eaf0c5304a 100755 > --- c/t/t4126-apply-empty.sh > +++ w/t/t4126-apply-empty.sh > @@ -66,4 +66,26 @@ 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 && > + git reset --hard && > + rm -fr "funny " && > + > + git apply --stat --check --apply sample.patch && > + test_must_be_empty "funny /empty" && > + > + git apply --stat --check --apply elpmas.patch && > + test_path_is_missing "funny /empty" && > + > + git apply -R --stat --check --apply elpmas.patch && > + test_must_be_empty "funny /empty" && > + > + git apply -R --stat --check --apply sample.patch && > + test_path_is_missing "funny /empty" > +' > + > test_done This seems to fail only on Windows, and I have run out of my today's allotment of time for this topic. The earlier part that creates the directory with a trailing SP, redirects to a file in such a directory to create an empty file, and adds that path to the index, all succeed and follow the &&-chain, but the step that runs "git diff" with "funny /" (i.e. the name of the directory a trailing slash) as the pathspec produces an empty patch, and "git apply" would of course choke on an empty file as an input. With the following band-aid, we can skip the test and the output from "sh t4126-*.sh -i -v -x" might give us a clue that explains how such a failure happens. Unfortunately GitHub CI's win test does not give us insight into a test that did not fail, so I did not get anything useful from the "ls -l" down there (I already knew that sample patches are empty files). ---- >8 ---- Date: Wed, 27 Mar 2024 14:41:26 -0700 Subject: [PATCH] t4126: make sure a directory with SP at the end is usable 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. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t4126-apply-empty.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh index eaf0c5304a..d2ac7a486f 100755 --- a/t/t4126-apply-empty.sh +++ b/t/t4126-apply-empty.sh @@ -66,14 +66,26 @@ test_expect_success 'apply --index create' ' git diff --exit-code ' -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" && - 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 && 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' ' git apply --stat --check --apply sample.patch && test_must_be_empty "funny /empty" && -- 2.44.0-368-gc75fd8d815
