From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Subject: Re: [PATCH 1/3] t7001: reformat to newer style
Date: Mon, 24 Sep 2018 09:09:58 -0700 [thread overview]
Message-ID: <xmqq4leeubah.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <7f77be2b-a084-5b8d-df65-1bb4b9c5da82@gmail.com> (Derrick Stolee's message of "Mon, 24 Sep 2018 09:31:16 -0400")
Derrick Stolee <stolee@gmail.com> writes:
>> +test_expect_success 'moving the file back into subdirectory' '
>> + cd path0 && git mv ../path1/COPYING COPYING
>> +'
>
> Split at &&, use subshell?
Yes, I was almost going to point out the same, saying "'reformat to
newer style' is much larger than only changing how the test body is
formatted", but was debating myself, as a good "modernization patch"
needs both mechanical changes and manual/semantic clean-ups, and it
is very clear that these three patches deliberately limit themselves
to the former for easier verification.
It is relatively rare that files are not touched by any in-flight
topic in the codebase, which is a good opportunity to apply this
kind of wholesale clean-up, so I tend to agree that it is a shame
not to do the non-mechanical clean up in the same series. Perhaps
the best way would be to keep these three mechanical steps as they
are, and then follow-up with non-mechanical clean-up like you
suggested.
>> +test_expect_success 'commiting the change' '
>> + cd .. && git commit -m move-in -a
>> +'
>
> Drop "cd .." (and the comments about being in path0)
... when the previous step moves to "git -C path0 mv ..." or
preferrably "(cd path0 && git mv ...)".
> [big snip]
>
>> +test_expect_success 'moving to existing tracked target with trailing slash' '
>> + mkdir path2 &&
>> + >path2/file && git add path2/file &&
> This line in particular looks a bit strange. What is this doing? At
> least we should split the &&.
Create an empty file by redirecting the output from a no-op into it,
and then adding the result. I agree with you that this would be
easier to read on two lines.
>> + git mv path1/path0/ path2/ &&
>> + test_path_is_dir path2/path0/
>> +'
next prev parent reply other threads:[~2018-09-24 16:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 23:58 [PATCH 0/3] bring some tests to newer style Stefan Beller
2018-09-21 23:58 ` [PATCH 1/3] t7001: reformat " Stefan Beller
2018-09-24 13:31 ` Derrick Stolee
2018-09-24 16:09 ` Junio C Hamano [this message]
2018-09-24 18:51 ` Stefan Beller
2018-09-25 20:36 ` Junio C Hamano
2018-09-21 23:58 ` [PATCH 2/3] t7004: reformat style Stefan Beller
2018-09-21 23:58 ` [PATCH 3/3] t0030: " Stefan Beller
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=xmqq4leeubah.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
--cc=stolee@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).