From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, sunshine@sunshineco.com,
martin.agren@gmail.com, szeder.dev@gmail.com
Subject: Re: [PATCHv3 1/5] t7406: simplify by using diff --name-only instead of diff --raw
Date: Tue, 07 Aug 2018 10:29:23 -0700 [thread overview]
Message-ID: <xmqqo9eekrv0.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180807164905.3859-2-newren@gmail.com> (Elijah Newren's message of "Tue, 7 Aug 2018 09:49:01 -0700")
Elijah Newren <newren@gmail.com> writes:
> We can get rid of some quoted tabs and make a few tests slightly easier
> to read and edit by just asking for the names of the files modified,
> since that's all these tests were interested in anyway.
Technically the quoted tab was making sure that we do not mistake
"subsubmodule" (if existed) as "submodule" we seek, so a faithful
replacement would be to find "^submodule", and "^submodule$" would
be an improvement. But we do not have paths with confusing names in
these tests, so we can leave it as-is, I guess.
I think 0/5 should fix the real bug you are deliberately keeping in
this patch, from the point of view of organization.
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> t/t7406-submodule-update.sh | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
> index f604ef7a72..e2405c96b5 100755
> --- a/t/t7406-submodule-update.sh
> +++ b/t/t7406-submodule-update.sh
> @@ -579,9 +579,9 @@ test_expect_success 'submodule update - update=none in .git/config' '
> git checkout master &&
> compare_head
> ) &&
> - git diff --raw | grep " submodule" &&
> + git diff --name-only | grep submodule &&
> git submodule update &&
> - git diff --raw | grep " submodule" &&
> + git diff --name-only | grep submodule &&
> (cd submodule &&
> compare_head
> ) &&
> @@ -597,9 +597,9 @@ test_expect_success 'submodule update - update=none in .git/config but --checkou
> git checkout master &&
> compare_head
> ) &&
> - git diff --raw | grep " submodule" &&
> + git diff --name-only | grep submodule &&
> git submodule update --checkout &&
> - test_must_fail git diff --raw \| grep " submodule" &&
> + test_must_fail git diff --name-only \| grep submodule &&
> (cd submodule &&
> test_must_fail compare_head
> ) &&
next prev parent reply other threads:[~2018-08-07 17:29 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 23:14 [PATCH] t7406: Make a test_must_fail call fail for the right reason Elijah Newren
2018-08-03 23:40 ` Eric Sunshine
2018-08-03 23:42 ` Eric Sunshine
2018-08-03 23:41 ` Junio C Hamano
2018-08-06 15:25 ` [PATCH 0/2] Simple fixes to t7406 Elijah Newren
2018-08-06 15:25 ` [PATCH 1/3] t7406: simplify by using diff --name-only instead of diff --raw Elijah Newren
2018-08-06 15:25 ` [PATCH 2/3] t7406: avoid having git commands upstream of a pipe Elijah Newren
2018-08-06 15:48 ` SZEDER Gábor
2018-08-06 16:09 ` Elijah Newren
2018-08-06 15:25 ` [PATCH 3/3] t7406: make a test_must_fail call fail for the right reason Elijah Newren
2018-08-07 9:07 ` SZEDER Gábor
2018-08-07 13:46 ` Elijah Newren
2018-08-07 7:50 ` [PATCH 0/2] Simple fixes to t7406 Martin Ågren
2018-08-07 13:40 ` Elijah Newren
2018-08-07 16:49 ` [PATCHv3 0/5] " Elijah Newren
2018-08-07 16:49 ` [PATCHv3 1/5] t7406: simplify by using diff --name-only instead of diff --raw Elijah Newren
2018-08-07 17:29 ` Junio C Hamano [this message]
2018-08-07 17:40 ` Elijah Newren
2018-08-07 18:18 ` Junio C Hamano
2018-08-07 16:49 ` [PATCHv3 2/5] t7406: avoid having git commands upstream of a pipe Elijah Newren
2018-08-07 16:49 ` [PATCHv3 3/5] t7406: prefer test_* helper functions to test -[feds] Elijah Newren
2018-08-07 17:34 ` Junio C Hamano
2018-08-07 16:49 ` [PATCHv3 4/5] t7406: avoid using test_must_fail for commands other than git Elijah Newren
2018-08-07 16:49 ` [PATCHv3 5/5] t7406: fix call that was failing for the wrong reason Elijah Newren
2018-08-07 17:37 ` Junio C Hamano
2018-08-08 16:31 ` [PATCHv4 0/5] Simple fixes to t7406 Elijah Newren
2018-08-08 16:31 ` [PATCHv4 1/5] t7406: fix call that was failing for the wrong reason Elijah Newren
2018-08-08 16:31 ` [PATCHv4 2/5] t7406: simplify by using diff --name-only instead of diff --raw Elijah Newren
2018-08-08 16:31 ` [PATCHv4 3/5] t7406: avoid having git commands upstream of a pipe Elijah Newren
2018-08-08 16:31 ` [PATCHv4 4/5] t7406: prefer test_* helper functions to test -[feds] Elijah Newren
2018-08-08 16:31 ` [PATCHv4 5/5] t7406: avoid using test_must_fail for commands other than git Elijah Newren
2018-08-13 20:28 ` [PATCHv3 0/5] Simple fixes to t7406 SZEDER Gábor
2018-08-18 20:52 ` Elijah Newren
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=xmqqo9eekrv0.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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 NNTP newsgroup(s).