From: Junio C Hamano <gitster@pobox•com>
To: Pasha Bolokhov <pasha.bolokhov@gmail•com>
Cc: git@vger•kernel.org, pclouds@gmail•com, peff@peff•net
Subject: Re: [PATCH alt-v3] Improve function dir.c:trim_trailing_spaces()
Date: Fri, 13 Jun 2014 13:23:47 -0700 [thread overview]
Message-ID: <xmqqoaxw1ru4.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1401748616-14632-1-git-send-email-pasha.bolokhov@gmail.com> (Pasha Bolokhov's message of "Mon, 2 Jun 2014 15:36:56 -0700")
Pasha Bolokhov <pasha.bolokhov@gmail•com> writes:
> diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
> index 63beb99..5ef5ad3 100755
> --- a/t/t0008-ignores.sh
> +++ b/t/t0008-ignores.sh
> @@ -806,4 +806,27 @@ test_expect_success !MINGW 'quoting allows trailing whitespace' '
> test_cmp err.expect err
> '
>
> +test_expect_success NOT_MINGW,NOT_CYGWIN 'correct handling of backslashes' '
> + rm -rf whitespace &&
> + mkdir whitespace &&
> + >"whitespace/trailing 1 " &&
> + >"whitespace/trailing 2 \\\\" &&
> + >"whitespace/trailing 3 \\\\" &&
> + >"whitespace/trailing 4 \\ " &&
> + >"whitespace/trailing 5 \\ \\ " &&
> + >"whitespace/trailing 6 \\a\\" &&
> + >whitespace/untracked &&
> + echo "whitespace/trailing 1 \\ " >ignore &&
> + echo "whitespace/trailing 2 \\\\\\\\\\\\\\\\" >>ignore &&
> + echo "whitespace/trailing 3 \\\\\\\\\\\\\\\\ " >>ignore &&
> + echo "whitespace/trailing 4 \\\\\\\\\\\\ " >>ignore &&
> + echo "whitespace/trailing 5 \\\\\\\\ \\\\\\\\\\\\ " >>ignore &&
> + echo "whitespace/trailing 6 \\\\\\\\a\\\\\\\\" >>ignore &&
> + echo whitespace/untracked >expect &&
> + >err.expect &&
> + git ls-files -o -X ignore whitespace >actual 2>err &&
> + test_cmp expect actual &&
> + test_cmp err.expect err
> +'
This passes with your shell set to dash but fails with bash.
Let's fix it up like so.
t/t0008-ignores.sh | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 5ef5ad3..39e55a1 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -816,12 +816,14 @@ test_expect_success NOT_MINGW,NOT_CYGWIN 'correct handling of backslashes' '
>"whitespace/trailing 5 \\ \\ " &&
>"whitespace/trailing 6 \\a\\" &&
>whitespace/untracked &&
- echo "whitespace/trailing 1 \\ " >ignore &&
- echo "whitespace/trailing 2 \\\\\\\\\\\\\\\\" >>ignore &&
- echo "whitespace/trailing 3 \\\\\\\\\\\\\\\\ " >>ignore &&
- echo "whitespace/trailing 4 \\\\\\\\\\\\ " >>ignore &&
- echo "whitespace/trailing 5 \\\\\\\\ \\\\\\\\\\\\ " >>ignore &&
- echo "whitespace/trailing 6 \\\\\\\\a\\\\\\\\" >>ignore &&
+ sed -e "s/Z$//" >ignore <<-\EOF &&
+ whitespace/trailing 1 \ Z
+ whitespace/trailing 2 \\\\Z
+ whitespace/trailing 3 \\\\ Z
+ whitespace/trailing 4 \\\ Z
+ whitespace/trailing 5 \\ \\\ Z
+ whitespace/trailing 6 \\a\\Z
+ EOF
echo whitespace/untracked >expect &&
>err.expect &&
git ls-files -o -X ignore whitespace >actual 2>err &&
next prev parent reply other threads:[~2014-06-13 20:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 22:36 [PATCH alt-v3] Improve function dir.c:trim_trailing_spaces() Pasha Bolokhov
2014-06-02 22:54 ` Junio C Hamano
2014-06-13 20:23 ` Junio C Hamano [this message]
2014-06-13 23:25 ` Jeff King
2014-06-14 2:45 ` Pasha Bolokhov
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=xmqqoaxw1ru4.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pasha.bolokhov@gmail$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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