From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Michael J Gruber" <git@grubix.eu>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: RE: [PATCH v2 2/4] show-branch tests: modernize test code
Date: Thu, 17 Jun 2021 16:29:01 -0500 [thread overview]
Message-ID: <60cbbe9d89cbd_1299208fa@natae.notmuch> (raw)
In-Reply-To: <patch-2.4-27f94abaed-20210617T105245Z-avarab@gmail.com>
Ævar Arnfjörð Bjarmason wrote:
> Modernize test code added in ce567d1867a (Add test to show that
> show-branch misses out the 8th column, 2008-07-23) and
> 11ee57bc4c4 (sort_in_topological_order(): avoid setting a commit flag,
> 2008-07-23) to use test helpers.
>
> I'm renaming "out" to "actual" for consistency with other tests, and
> introducing a "branches.sorted" file in the setup, to make it clear
> that it's important that the list be sorted in this particular way.
That is better.
> The "show-branch" output is indented with spaces, which would cause
> complaints under "git show --check" with an indented here-doc
> block. Let's prefix the lines with "> " to work around that, and to
> make it clear that the leading whitespace is important.
I'm not sure this is an improvement. To me the original code is just
fine. Also, I don't think writing an 'expect' file belong in a setup
step.
Additionally I would do this change in a separate patch.
> We can also get rid of the hardcoding of "main" added here in
> 334afbc76fb (tests: mark tests relying on the current default for
> `init.defaultBranch`, 2020-11-18). For this test we're setting up an
> "initial" commit anyway, and now that we've moved over to test_commit
> we can reference that instead.
That's also good.
All the changes in this patch look good to me, however, they are smashed
together in a way that makes the review harder, I see:
1. Use test_commit
2. Rename out to actual
3. Use >actual instead of > actual
4. Use test_seq instead of $numbers
5. Use branches.sorted instead of branch$i
6. Use test_config instead of git config
7. Use internal sed 's/^ //' instead of outside cat
I'm on-board with 6 out of 7, but if these were done it at least 2
patches, they would be clearer. I in fact would prefer one patch per
change (although maybe squash 3 with 2).
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-17 21:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 17:18 [PATCH 0/4] show-branch: add missing tests, trivial color output fix Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 1/4] show-branch tests: rename the one "show-branch" test file Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 2/4] show-branch tests: modernize test code Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 3/4] show-branch: fix and test --color output Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 4/4] show-branch tests: add missing tests Ævar Arnfjörð Bjarmason
2021-06-15 9:24 ` Michael J Gruber
2021-06-15 3:11 ` [PATCH 0/4] show-branch: add missing tests, trivial color output fix Junio C Hamano
2021-06-17 10:53 ` [PATCH v2 0/4] show-branch: add missing tests, trivial color output change Ævar Arnfjörð Bjarmason
2021-06-17 10:53 ` [PATCH v2 1/4] show-branch tests: rename the one "show-branch" test file Ævar Arnfjörð Bjarmason
2021-06-17 21:16 ` Felipe Contreras
2021-06-17 10:53 ` [PATCH v2 2/4] show-branch tests: modernize test code Ævar Arnfjörð Bjarmason
2021-06-17 21:29 ` Felipe Contreras [this message]
2021-06-17 10:53 ` [PATCH v2 3/4] show-branch: don't <COLOR></RESET> for space characters Ævar Arnfjörð Bjarmason
2021-06-17 21:41 ` Felipe Contreras
2021-06-17 10:53 ` [PATCH v2 4/4] show-branch tests: add missing tests Ævar Arnfjörð Bjarmason
2021-06-17 21:44 ` Felipe Contreras
2021-06-17 21:46 ` [PATCH v2 0/4] show-branch: add missing tests, trivial color output change Felipe Contreras
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=60cbbe9d89cbd_1299208fa@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.