git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v1 1/2] t/*: fix pipe placement and remove \'s

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Sep 17, 2018, 16:31 UTC
Message-ID
<20180917163137.GB89942@aiede.svl.corp.google.com>
In-Reply-To
<a4c833da81d83ea0e605c936d90ea9c7f5667d93.1536969438.git.matvore@google.com>
Matthew DeVore wrote:
Show 6 quoted lines
> Subject: t/*: fix pipe placement and remove \'s
>
> Where ever there was code in the tests like this:
>
> 	foo \
> 		| bar
Language nits:
- s/Where ever/Wherever/
- Git's commit messages use the present tense to describe the existing
  previous state of the codebase, as though reporting a bug.
Maybe something like
	tests: standardize pipe placement
	Instead of using a line-continuation and pipe on the second
	line, take advantage of the shell's implicit line continuation
	after a pipe character.  So for example, instead of
		some long line \
			| next line
	use
		some long line |
		next line

At this point, it would be useful to say something about rationale --- for example,

	This better matches the coding style documented in
	Documentation/CodingGuidelines and used in shell scripts
	elsewhere in Git.
Except: is this documented in Documentation/CodingGuidelines?  Or,
better, is there a linter that we can run in the test-lint target of
t/Makefile to ensure we keep sticking to this style?
[...]
Show 11 quoted lines
> --- a/t/lib-gpg.sh
> +++ b/t/lib-gpg.sh
> @@ -57,8 +57,8 @@ then
>  		echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
>  			--passphrase-fd 0 --pinentry-mode loopback \
>  			--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
> -		gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
> -			| grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
> +		gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
> +		grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
>  			${GNUPGHOME}/trustlist.txt &&

I think this would be more readable with one item from the pipeline per line:

		gpgsm --homedir ... |
		grep ... |
		cut ... |
		tr ... >... &&
[...]
Show 10 quoted lines
> --- a/t/t1006-cat-file.sh
> +++ b/t/t1006-cat-file.sh
> @@ -218,8 +218,8 @@ test_expect_success "--batch-check for a non-existent hash" '
>      test "0000000000000000000000000000000000000042 missing
>  0000000000000000000000000000000000000084 missing" = \
>      "$( ( echo 0000000000000000000000000000000000000042;
> -         echo_without_newline 0000000000000000000000000000000000000084; ) \
> -       | git cat-file --batch-check)"
> +         echo_without_newline 0000000000000000000000000000000000000084; ) |
> +       git cat-file --batch-check)"

This test is problematic in a lot of ways. Most importantly, it ignores the exist status from git cat-file.

So it should say something like:
	cat >expect <<-\EOF &&
		foobar42 missing
		foobar84 missing
	EOF
	printf "foobar42\nfoobar84" |
	git cat-file --batch-check >actual &&
	test_cmp expect actual
If we want to restrict to the pipeline style fixes, we could do
	test "..." = "$(
		{	# Couldn't resist changing the ( to {!
			echo ... &&	# Couldn't resist changing the ; to &&!
			echo_without_newline ...
		} |
		git cat-file --batch-check
	)"

but unless there's a linter that we're helping support, it's probably better to skip this file and use a dedicated patch to modernize its style more generally.

[...]
Show 10 quoted lines
> --- a/t/t1300-config.sh
> +++ b/t/t1300-config.sh
> @@ -1770,8 +1770,9 @@ test_expect_success '--show-origin stdin with file include' '
>  	cat >expect <<-EOF &&
>  		file:$INCLUDE_DIR/stdin.include	include
>  	EOF
> -	echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" \
> -		| git config --show-origin --includes --file - user.stdin >output &&
> +	echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
> +	git config --show-origin --includes --file - user.stdin >output &&
Okay.
[...]
Show 12 quoted lines
> --- a/t/t5317-pack-objects-filter-objects.sh
> +++ b/t/t5317-pack-objects-filter-objects.sh
> @@ -20,17 +20,20 @@ test_expect_success 'setup r1' '
>  '
>  
>  test_expect_success 'verify blob count in normal packfile' '
> -	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
> -		| awk -f print_2.awk \
> -		| sort >expected &&
> +	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
> +	awk -f print_2.awk |
> +	sort >expected &&

This loses the exit status from git, so we should make it write to a temporary file instead (as a separate patch).

[...]
Show 6 quoted lines
> -	git -C r1 verify-pack -v ../all.pack \
> -		| grep blob \
> -		| awk -f print_1.awk \
> -		| sort >observed &&
> +
> +	git -C r1 verify-pack -v ../all.pack |
Likewise (and likewise for the rest in this file).
[...]
Show 11 quoted lines
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -50,8 +50,9 @@ pull_to_client () {
>  			case "$heads" in *B*)
>  			    git update-ref refs/heads/B "$BTIP";;
>  			esac &&
> -			git symbolic-ref HEAD refs/heads/$(echo $heads \
> -				| sed -e "s/^\(.\).*$/\1/") &&
> +
> +			git symbolic-ref HEAD refs/heads/$(echo $heads |
> +			sed -e "s/^\(.\).*$/\1/") &&

It would be better to use a temporary variable. If we're just changing line wrapping, then this would be

			git symbolic-ref HAD refs/heads/$(
				echo $heads |
				sed ...
			) &&
[...]
Show 12 quoted lines
> --- a/t/t5616-partial-clone.sh
> +++ b/t/t5616-partial-clone.sh
> @@ -34,10 +34,12 @@ test_expect_success 'setup bare clone for server' '
>  # confirm partial clone was registered in the local config.
>  test_expect_success 'do partial clone 1' '
>  	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
> -	git -C pc1 rev-list HEAD --quiet --objects --missing=print \
> -		| awk -f print_1.awk \
> -		| sed "s/?//" \
> -		| sort >observed.oids &&
> +
> +	git -C pc1 rev-list HEAD --quiet --objects --missing=print |

Also needs to write to a temporary to avoid losing the exist status (and likewise for the rest of this file).

[...]
Show 16 quoted lines
> --- a/t/t6112-rev-list-filters-objects.sh
> +++ b/t/t6112-rev-list-filters-objects.sh
> @@ -20,24 +20,28 @@ test_expect_success 'setup r1' '
>  '
>  
>  test_expect_success 'verify blob:none omits all 5 blobs' '
> -	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
> -		| awk -f print_2.awk \
> -		| sort >expected &&
> -	git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none \
> -		| awk -f print_1.awk \
> -		| sed "s/~//" \
> -		| sort >observed &&
> +	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
> +	awk -f print_2.awk |
> +	sort >expected &&
Likewise.
[...]
Show 10 quoted lines
> --- a/t/t9101-git-svn-props.sh
> +++ b/t/t9101-git-svn-props.sh
> @@ -193,8 +193,8 @@ test_expect_success 'test propget' "
>  	git svn propget svn:ignore . | cmp - prop.expect &&
>  	cd deeply &&
>  	git svn propget svn:ignore . | cmp - ../prop.expect &&
> -	git svn propget svn:entry:committed-rev nested/directory/.keep \
> -	  | cmp - ../prop2.expect &&
> +	git svn propget svn:entry:committed-rev nested/directory/.keep |
> +	cmp - ../prop2.expect &&
Likewise.

Thanks and hope that helps, Jonathan

Previous: Matthew DeVoreNext: Matthew DeVore
Message 3 of 66 in “Cleanup tests for test_cmp argument ordering and "|" placement”
  1. 0/2 Cleanup tests for test_cmp argument ordering and "|" placementMatthew DeVore, Sep 15, 2018
  2. 1/2 t/*: fix pipe placement and remove \'sMatthew DeVore, Sep 15, 2018
  3. Jonathan NiederSep 17, 2018
  4. Matthew DeVoreSep 17, 2018
  5. 2/2 t/*: fix ordering of expected/observed argumentsMatthew DeVore, Sep 15, 2018
  6. Matthew DeVoreSep 17, 2018
  7. Junio C HamanoSep 15, 2018
  8. 0/6 Clean up tests for test_cmp arg ordering and pipe placementMatthew DeVore, Sep 17, 2018
  9. 4/6 tests: Add linter check for pipe placement styleMatthew DeVore, Sep 17, 2018
  10. Eric SunshineSep 18, 2018
  11. Matthew DeVoreSep 19, 2018
  12. 0/5 Clean up tests for test_cmp arg ordering and pipe placementMatthew DeVore, Sep 21, 2018
  13. 1/5 CodingGuidelines: add shell piping guidelinesMatthew DeVore, Sep 21, 2018
  14. Eric SunshineSep 21, 2018
  15. Matthew DeVoreSep 21, 2018
  16. SZEDER GáborSep 24, 2018
  17. Matthew DeVoreSep 25, 2018
  18. SZEDER GáborSep 27, 2018
  19. Matthew DeVoreOct 1, 2018
  20. 2/5 tests: standardize pipe placementMatthew DeVore, Sep 21, 2018
  21. 3/5 t/*: fix ordering of expected/observed argumentsMatthew DeVore, Sep 21, 2018
  22. 4/5 tests: don't swallow Git errors upstream of pipesMatthew DeVore, Sep 21, 2018
  23. 5/5 t9109: don't swallow Git errors upstream of pipesMatthew DeVore, Sep 21, 2018
  24. 0/7 Clean up tests for test_cmp arg ordering and pipe placementMatthew DeVore, Oct 3, 2018
  25. 1/7 t/README: reformat Do, Don't, Keep in mind listsMatthew DeVore, Oct 3, 2018
  26. Junio C HamanoOct 5, 2018
  27. Matthew DeVoreOct 5, 2018
  28. 2/7 Documentation: add shell guidelinesMatthew DeVore, Oct 3, 2018
  29. Junio C HamanoOct 5, 2018
  30. Matthew DeVoreOct 5, 2018
  31. 3/7 tests: standardize pipe placementMatthew DeVore, Oct 3, 2018
  32. 4/7 t/*: fix ordering of expected/observed argumentsMatthew DeVore, Oct 3, 2018
  33. 5/7 tests: don't swallow Git errors upstream of pipesMatthew DeVore, Oct 3, 2018
  34. Junio C HamanoOct 5, 2018
  35. Matthew DeVoreOct 5, 2018
  36. Matthew DeVoreOct 5, 2018
  37. 6/7 t9109: don't swallow Git errors upstream of pipesMatthew DeVore, Oct 3, 2018
  38. 7/7 tests: order arguments to git-rev-list properlyMatthew DeVore, Oct 3, 2018
  39. Matthew DeVoreOct 3, 2018
  40. Junio C HamanoOct 5, 2018
  41. 0/7 subject: Clean up tests for test_cmp arg ordering and pipe placementMatthew DeVore, Oct 5, 2018
  42. 1/7 t/README: reformat Do, Don't, Keep in mind listsMatthew DeVore, Oct 5, 2018
  43. 2/7 Documentation: add shell guidelinesMatthew DeVore, Oct 5, 2018
  44. 3/7 tests: standardize pipe placementMatthew DeVore, Oct 5, 2018
  45. 4/7 t/*: fix ordering of expected/observed argumentsMatthew DeVore, Oct 5, 2018
  46. 5/7 tests: don't swallow Git errors upstream of pipesMatthew DeVore, Oct 5, 2018
  47. 6/7 t9109: don't swallow Git errors upstream of pipesMatthew DeVore, Oct 5, 2018
  48. 7/7 tests: order arguments to git-rev-list properlyMatthew DeVore, Oct 5, 2018
  49. Junio C HamanoOct 6, 2018
  50. 1/6 CodingGuidelines: add shell piping guidelinesMatthew DeVore, Sep 17, 2018
  51. Eric SunshineSep 18, 2018
  52. Matthew DeVoreSep 19, 2018
  53. Eric SunshineSep 19, 2018
  54. Junio C HamanoSep 19, 2018
  55. Matthew DeVoreSep 19, 2018
  56. 2/6 tests: standardize pipe placementMatthew DeVore, Sep 17, 2018
  57. 3/6 t/*: fix ordering of expected/observed argumentsMatthew DeVore, Sep 17, 2018
  58. 4/6 tests: add linter check for pipe placement styleMatthew DeVore, Sep 17, 2018
  59. 5/6 tests: split up pipesMatthew DeVore, Sep 17, 2018
  60. Eric SunshineSep 18, 2018
  61. Matthew DeVoreSep 19, 2018
  62. 6/6 t9109-git-svn-props.sh: split up several pipesMatthew DeVore, Sep 17, 2018
  63. Eric SunshineSep 18, 2018
  64. Matthew DeVoreSep 19, 2018
  65. Eric SunshineSep 19, 2018
  66. Matthew DeVoreSep 19, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.