From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Jeff King <peff@peff.net>,
Han Young <hanyang.tony@bytedance.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH] t4126: fix "funny directory name" test on Windows (again)
Date: Thu, 28 Mar 2024 22:37:25 -0700 [thread overview]
Message-ID: <xmqqwmplvbsa.fsf_-_@gitster.g> (raw)
In-Reply-To: <xmqqil15srub.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 28 Mar 2024 19:18:52 -0700")
Even though "git update-index --cacheinfo" ought to be filesystem
agnostic, somehow
$ git update-index --add --cacheinfo "100644,$empty_blob,funny /empty"
fails only there. That unfortunately makes the approach of the
previous step unworkable.
Resurrect the earlier approach to protect the test with a
prerequisite to make sure we do not needlessly fail the CI.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t4126-apply-empty.sh | 43 +++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index 2462cdf904..d2ac7a486f 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -66,29 +66,38 @@ test_expect_success 'apply --index create' '
git diff --exit-code
'
-test_expect_success 'parsing a patch 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 reset --hard &&
- empty_blob=$(test_oid empty_blob) &&
- echo "$empty_blob" >expect &&
- 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 &&
+ 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 --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
next prev parent reply other threads:[~2024-03-29 5:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 9:52 [PATCH 0/1] quote: quote space Han Young
2024-03-19 9:52 ` [PATCH 1/1] " Han Young
2024-03-19 9:59 ` Kristoffer Haugsbakk
2024-03-19 15:15 ` [PATCH 0/1] " Junio C Hamano
2024-03-19 22:56 ` Junio C Hamano
2024-03-26 21:41 ` Junio C Hamano
2024-03-27 9:17 ` Jeff King
2024-03-27 14:59 ` Junio C Hamano
2024-03-27 22:11 ` Junio C Hamano
2024-03-28 10:32 ` Jeff King
2024-03-28 11:40 ` Jeff King
2024-03-28 17:05 ` Eric Sunshine
2024-03-28 17:31 ` Junio C Hamano
2024-03-28 21:08 ` [PATCH v2] t4126: make sure a directory with SP at the end is usable Junio C Hamano
2024-03-29 2:18 ` Junio C Hamano
2024-03-29 5:37 ` Junio C Hamano [this message]
2024-03-29 12:00 ` [PATCH] t4126: fix "funny directory name" test on Windows (again) Jeff King
2024-03-29 17:21 ` [PATCH v2] " Junio C Hamano
2024-03-29 18:34 ` Jeff King
2024-03-29 11:27 ` [PATCH v2] t4126: make sure a directory with SP at the end is usable Jeff King
2024-03-29 17:01 ` Junio C Hamano
2024-04-27 14:47 ` Johannes Schindelin
2024-04-27 17:20 ` Junio C Hamano
2024-03-28 16:19 ` [PATCH 0/1] quote: quote space Junio C Hamano
2024-03-28 16:30 ` Jeff King
2024-03-28 16:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwmplvbsa.fsf_-_@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=hanyang.tony@bytedance.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).