[PATCH v2] t4126: fix "funny directory name" test on Windows (again)

From

Junio C Hamano <gitster@pobox.com>

Date

Mar 29, 2024, 17:21 UTC

Message-ID

<xmqq5xx50x8p.fsf_-_@gitster.g>

In-Reply-To

<xmqqwmplvbsa.fsf_-_@gitster.g>

    $ git update-index --add --cacheinfo "100644,$empty_blob,funny /empty"

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 Another reason for using MINGW is that the custom prerequisite
 would not have been a good match for lazy_prereq mechanism, which
 wants to isolate itself by creating a temporary directory to run
 the test for prerequisites, which means we are not expected use the
 main index or object store to test for prerequisites, either, which
 in turn means we are pretty much forbidden from using Git while
 computing the prerequisite.  "a platform fails the prerequisite if
 the steps to create sample patches do not work" was how the earlier
 step computed the custom prerequisite, which cannot be done without
 creating another repository in the temporary place given, which
 means we cannot reuse the patches created in the real test.

 Also, if a platform other than MINGW fails the early part of this
 test, we would want to _know_ about it, even if we may not want to
 fix it.  A custom prerequisite will defeat that.

 t/t4126-apply-empty.sh | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index 2462cdf904..56210b5609 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -66,29 +66,28 @@ test_expect_success 'apply --index create' '
 	git diff --exit-code
 '
 
-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 &&
+test_expect_success !MINGW 'apply with no-contents and a funny pathname' '
+	test_when_finished "rm -fr \"funny \"; git reset --hard" &&
+
+	mkdir "funny " &&
+	>"funny /empty" &&
+	git add "funny /empty" &&
+	git diff HEAD -- "funny /" >sample.patch &&
+	git diff -R HEAD -- "funny /" >elpmas.patch &&
 
-	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 reset --hard &&
 
-	git apply --cached --stat --check --apply sample.patch &&
-	git rev-parse --verify ":funny /empty" >actual &&
-	test_cmp expect actual &&
+	git apply --stat --check --apply sample.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 --stat --check --apply elpmas.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 --stat --check --apply elpmas.patch &&
+	test_must_be_empty "funny /empty" &&
 
-	git apply -R --cached --stat --check --apply sample.patch &&
-	test_must_fail git rev-parse --verify ":funny /empty"
+	git apply -R --stat --check --apply sample.patch &&
+	test_path_is_missing "funny /empty"
 '
 
 test_done

-- 
2.44.0-413-gd6fd04375f