From: Junio C Hamano <gitster@pobox.com>
To: Andrei Rybak <rybak.a.v@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Øystein Walle" <oystwa@gmail.com>
Subject: Re: [PATCH] t2024: fix loose/strict local base branch DWIM test
Date: Mon, 10 Apr 2023 10:37:10 -0700 [thread overview]
Message-ID: <xmqqfs97ej09.fsf@gitster.g> (raw)
In-Reply-To: <20230408205450.569548-1-rybak.a.v@gmail.com> (Andrei Rybak's message of "Sat, 8 Apr 2023 22:54:50 +0200")
Andrei Rybak <rybak.a.v@gmail.com> writes:
>> 3. t2024-checkout-dwim.sh
>> Test 'loosely defined local base branch is reported correctly' in t2024
>> has an interesting validation of output of "git checkout":
>>
>> git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
>> status_uno_is_clean &&
>> git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual &&
>> status_uno_is_clean &&
>>
>> test_cmp expect actual
>>
>> which is fine, except that neither file "expect" nor "actual" contain
>> the string "BRANCHNAME". And this test was broken when it was
>> introduced in 05e73682cd (checkout: report upstream correctly even with
>> loosely defined branch.*.merge, 2014-10-14). It was probably intended
>> for this test to redirect standard error of "git checkout". It should
>> be cleaned up as a separate patch/topic.
>
> Here's the patch. Alternatively, the fix could be to just drop the sed
> invocation from this test.
Or we could check both stdout and stderr separately. I think the
change in this patch reflects the intention of the original most
closely, so let's queue it as-is.
Thanks.
>
> t/t2024-checkout-dwim.sh | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
> index 4a1c901456..74049a9812 100755
> --- a/t/t2024-checkout-dwim.sh
> +++ b/t/t2024-checkout-dwim.sh
> @@ -305,10 +305,13 @@ test_expect_success 'loosely defined local base branch is reported correctly' '
> test_config branch.strict.merge refs/heads/main &&
> test_config branch.loose.merge main &&
>
> - git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
> + git checkout strict >expect.raw 2>&1 &&
> + sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
> status_uno_is_clean &&
> - git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual &&
> + git checkout loose >actual.raw 2>&1 &&
> + sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
> status_uno_is_clean &&
> + grep BRANCHNAME actual &&
>
> test_cmp expect actual
> '
next prev parent reply other threads:[~2023-04-10 17:37 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-01 21:28 [PATCH v1 0/6] t: fix unused files, part 2 Andrei Rybak
2023-04-01 21:28 ` [PATCH v1 1/6] t0300: don't create unused file Andrei Rybak
2023-04-02 1:30 ` Eric Sunshine
2023-04-01 21:28 ` [PATCH v1 2/6] t1300: fix config file syntax error descriptions Andrei Rybak
2023-04-01 21:28 ` [PATCH v1 3/6] t1300: don't create unused files Andrei Rybak
2023-04-01 21:28 ` [PATCH v1 4/6] t1450: " Andrei Rybak
2023-04-01 21:28 ` [PATCH v1 5/6] t1502: " Andrei Rybak
2023-04-01 21:28 ` [PATCH v1 6/6] t2019: " Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 0/6] t: fix unused files, part 2 Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 1/6] t0300: don't create unused file Andrei Rybak
2023-04-06 8:34 ` Ævar Arnfjörð Bjarmason
2023-04-06 21:01 ` Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 2/6] t1300: fix config file syntax error descriptions Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 3/6] t1300: don't create unused files Andrei Rybak
2023-04-06 8:38 ` Ævar Arnfjörð Bjarmason
2023-04-06 21:30 ` Andrei Rybak
2023-04-06 21:35 ` git config tests for "'git config ignores pairs ..." (was Re: [PATCH v2 3/6] t1300: don't create unused files) Andrei Rybak
2023-04-14 8:13 ` [PATCH v1 0/2] git config tests for "'git config ignores pairs ..." Andrei Rybak
2023-04-14 8:13 ` [PATCH v1 1/2] t1300: drop duplicate test Andrei Rybak
2023-04-14 8:13 ` [PATCH v1 2/2] t1300: check stderr for "ignores pairs" tests Andrei Rybak
2023-04-14 13:28 ` Andrei Rybak
2023-04-18 17:50 ` [PATCH v2 0/3] git config tests for "'git config ignores pairs ..." Andrei Rybak
2023-04-18 17:50 ` [PATCH v2 1/3] t1300: drop duplicate test Andrei Rybak
2023-04-18 18:37 ` Junio C Hamano
2023-04-18 17:50 ` [PATCH v2 2/3] t1300: check stderr for "ignores pairs" tests Andrei Rybak
2023-04-18 18:39 ` Junio C Hamano
2023-04-18 17:50 ` [RFC PATCH v2 3/3] t1300: add tests for missing keys Andrei Rybak
2023-04-18 19:31 ` Junio C Hamano
2023-04-18 17:53 ` [PATCH v2 0/3] git config tests for "'git config ignores pairs ..." Andrei Rybak
2023-04-23 13:46 ` [PATCH v3 " Andrei Rybak
2023-04-23 13:46 ` [PATCH v3 1/3] t1300: drop duplicate test Andrei Rybak
2023-04-23 13:46 ` [PATCH v3 2/3] t1300: check stderr for "ignores pairs" tests Andrei Rybak
2023-04-23 13:46 ` [PATCH v3 3/3] t1300: add tests for missing keys Andrei Rybak
2023-05-01 22:02 ` [PATCH v3 0/3] git config tests for "'git config ignores pairs ..." Junio C Hamano
2023-05-02 19:58 ` Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 4/6] t1450: don't create unused files Andrei Rybak
2023-04-06 8:41 ` Ævar Arnfjörð Bjarmason
2023-04-06 22:19 ` Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 5/6] t1502: " Andrei Rybak
2023-04-06 8:15 ` Øystein Walle
2023-04-06 8:47 ` Ævar Arnfjörð Bjarmason
2023-04-06 19:51 ` Andrei Rybak
2023-04-03 22:33 ` [PATCH v2 6/6] t2019: " Andrei Rybak
2023-04-06 8:44 ` Ævar Arnfjörð Bjarmason
2023-04-07 2:19 ` Andrei Rybak
2023-04-08 20:54 ` [PATCH] t2024: fix loose/strict local base branch DWIM test Andrei Rybak
2023-04-10 17:37 ` Junio C Hamano [this message]
2023-04-17 19:10 ` [PATCH v3 0/6] t: fix unused files, part 2 Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 1/6] t0300: don't create unused file Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 2/6] t1300: fix config file syntax error descriptions Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 3/6] t1300: don't create unused files Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 4/6] t1450: " Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 5/6] t1502: " Andrei Rybak
2023-04-17 19:10 ` [PATCH v3 6/6] t2019: " Andrei Rybak
2023-05-01 21:52 ` [PATCH v3 0/6] t: fix unused files, part 2 Junio C Hamano
2023-05-02 21:03 ` Andrei Rybak
2023-05-03 4:11 ` Elijah Newren
2023-05-03 15:54 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfs97ej09.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=oystwa@gmail.com \
--cc=rybak.a.v@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).