From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Han Young <hanyang.tony@bytedance.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 0/1] quote: quote space
Date: Wed, 27 Mar 2024 15:11:08 -0700 [thread overview]
Message-ID: <xmqqsf0bz5oj.fsf@gitster.g> (raw)
In-Reply-To: <xmqqfrwlltjn.fsf@gitster.g> (Junio C. Hamano's message of "Tue, 19 Mar 2024 15:56:44 -0700")
Junio C Hamano <gitster@pobox.com> 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@pobox.com>
---
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
next prev parent reply other threads:[~2024-03-27 22:11 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 [this message]
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 ` [PATCH] t4126: fix "funny directory name" test on Windows (again) Junio C Hamano
2024-03-29 12:00 ` 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=xmqqsf0bz5oj.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 \
/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).