threads / patch / 62372

patcht1016: clean up style

Subject: [PATCH] t1016: clean up style

## tl;dr

5 messages between Oct 20, 2024 and Oct 22, 2024. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Andrew Kreimer· Oct 20, 2024, 12:17 UTC · lore
Use `test_config`.
Remove whitespace after redirect operator.
Reported-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
As discussed in:
  - https://lore.kernel.org/git/ZxFyKXDCJkRZYYQY@nand.local/
Tested:
  - ubuntu-latest, GitHub Actions.
 t/t1016-compatObjectFormat.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Show changes to t/t1016-compatObjectFormat.sh +2 −2
diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh
index be3206a16f..0cc62d2a2d 100755
--- a/t/t1016-compatObjectFormat.sh
+++ b/t/t1016-compatObjectFormat.sh
@@ -116,8 +116,8 @@ do
 		git config core.repositoryformatversion 1 &&
 		git config extensions.objectformat $hash &&
 		git config extensions.compatobjectformat $(compat_hash $hash) &&
-		git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
-		echo "Hellow World!" > hello &&
+		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
+		echo "Hellow World!" >hello &&
 		eval hello_${hash}_oid=$(git hash-object hello) &&
 		git update-index --add hello &&
 		git commit -m "Initial commit" &&

-- 
2.39.5
Kristoffer Haugsbakk· Oct 20, 2024, 12:46 UTC · re: Andrew Kreimer · lore

Re: [PATCH] t1016: clean up style

Hi
On Sun, Oct 20, 2024, at 14:17, Andrew Kreimer wrote:
Show 14 quoted lines
> Use `test_config`.
>
> Remove whitespace after redirect operator.
>
> Reported-by: Taylor Blau <me@ttaylorr.com>
> Signed-off-by: Andrew Kreimer <algonell@gmail.com>
> ---
> As discussed in:
>   - https://lore.kernel.org/git/ZxFyKXDCJkRZYYQY@nand.local/
> […]
> -		git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> -		echo "Hellow World!" > hello &&
> +		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> +		echo "Hellow World!" >hello &&
What Taylor wrote:
> Thanks, both. [Andrew] -- it's fine to do this in the same, or a
> separate patch in the new round. Thanks.

You’ve posted a new, standalone patch. But what Taylor asked for was a new round on that typo patch where you either squash these changes into the original patch or have the typo patch plus this one.

At least that’s how I understand it.

This patch by itself doesn’t do much since the file is full of this style violation. Which I now realize is what you meant when you asked:[1]

> Do you mean that '> more' and '> another' should be handled similarly?

You were referring to other style violations in the file. But I only looked at the email so I didn’t catch that.

🔗 1: https://lore.kernel.org/git/ZxKSFBl_pV2r99dY@void.void/
Taylor Blau· Oct 21, 2024, 21:45 UTC · re: Kristoffer Haugsbakk · lore

Re: [PATCH] t1016: clean up style

On Sun, Oct 20, 2024 at 02:46:18PM +0200, Kristoffer Haugsbakk wrote:
Show 28 quoted lines
> Hi
>
> On Sun, Oct 20, 2024, at 14:17, Andrew Kreimer wrote:
> > Use `test_config`.
> >
> > Remove whitespace after redirect operator.
> >
> > Reported-by: Taylor Blau <me@ttaylorr.com>
> > Signed-off-by: Andrew Kreimer <algonell@gmail.com>
> > ---
> > As discussed in:
> >   - https://lore.kernel.org/git/ZxFyKXDCJkRZYYQY@nand.local/
> > […]
> > -		git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> > -		echo "Hellow World!" > hello &&
> > +		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> > +		echo "Hellow World!" >hello &&
>
> What Taylor wrote:
>
> > Thanks, both. [Andrew] -- it's fine to do this in the same, or a
> > separate patch in the new round. Thanks.
>
> You’ve posted a new, standalone patch.  But what Taylor asked for was a
> new round on that typo patch where you either squash these changes into
> the original patch or have the typo patch plus this one.
>
> At least that’s how I understand it.

I said originally that either was fine, but then revised my statement after remembering that the original topic was already in 'next', so any further changes would have to be done on top.

Thanks, Taylor

Taylor Blau· Oct 21, 2024, 21:48 UTC · re: Taylor Blau · lore

Re: [PATCH] t1016: clean up style

On Mon, Oct 21, 2024 at 05:45:56PM -0400, Taylor Blau wrote:
Show 33 quoted lines
> On Sun, Oct 20, 2024 at 02:46:18PM +0200, Kristoffer Haugsbakk wrote:
> > Hi
> >
> > On Sun, Oct 20, 2024, at 14:17, Andrew Kreimer wrote:
> > > Use `test_config`.
> > >
> > > Remove whitespace after redirect operator.
> > >
> > > Reported-by: Taylor Blau <me@ttaylorr.com>
> > > Signed-off-by: Andrew Kreimer <algonell@gmail.com>
> > > ---
> > > As discussed in:
> > >   - https://lore.kernel.org/git/ZxFyKXDCJkRZYYQY@nand.local/
> > > […]
> > > -		git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> > > -		echo "Hellow World!" > hello &&
> > > +		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
> > > +		echo "Hellow World!" >hello &&
> >
> > What Taylor wrote:
> >
> > > Thanks, both. [Andrew] -- it's fine to do this in the same, or a
> > > separate patch in the new round. Thanks.
> >
> > You’ve posted a new, standalone patch.  But what Taylor asked for was a
> > new round on that typo patch where you either squash these changes into
> > the original patch or have the typo patch plus this one.
> >
> > At least that’s how I understand it.
>
> I said originally that either was fine, but then revised my statement
> after remembering that the original topic was already in 'next', so any
> further changes would have to be done on top.

...but after queueing, this patch does not apply cleanly on ak/typofix, which is what this patch should be based on AFAICT.

Andrew, would you please send a version based on the aforementioned topic?

Thanks, Taylor

Andrew Kreimer· Oct 22, 2024, 10:29 UTC · re: Taylor Blau · lore

Re: [PATCH] t1016: clean up style

On Mon, Oct 21, 2024 at 05:48:05PM -0400, Taylor Blau wrote:
Show 8 quoted lines
> ...but after queueing, this patch does not apply cleanly on ak/typofix,
> which is what this patch should be based on AFAICT.
> 
> Andrew, would you please send a version based on the aforementioned
> topic?
> 
> Thanks,
> Taylor
Absolutely, thank you both for the clarification.

← back to recent threads