Re: [PATCH 1/5] t1300: write test expectations in the test's body

From: Kristoffer Haugsbakk <hidden>
Date: 2025-09-11 16:50:50

On Thu, Sep 11, 2025, at 15:24, Patrick Steinhardt wrote:

There are a bunch of tests in t1300 where we write the test expectation
handed over to `test_cmp ()` outside of the test body. This does not
match our modern test style, and there isn't really a reason why this
would need to happen outside of the test bodies.

Convert those to instead do so as part of the test itself.

Note that there are two exceptions that we don't convert. In both of
these cases the expectation is reused across multiple tests, and thus a
conversion where we'd move that into the first test that uses the
expectation would be invalid. Those are simply left as-is for now.

This is just a suggestion (which everything is):

    Note that there are two exceptions that we leave as-is for now since
    they are reused across tests.

quoted hunk ↗ jump to hunk

Signed-off-by: Patrick Steinhardt <redacted>
---
 t/t1300-config.sh | 290 ++++++++++++++++++++++++------------------------------
 1 file changed, 129 insertions(+), 161 deletions(-)

diff --git a/t/t1300-config.sh b/t/t1300-config.sh

For the following I looked mostly at a color-move etc. diff as well as
the commit.

quoted hunk ↗ jump to hunk

index f856821839..bde9bda234 100755

--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh

@@ -134,38 +134,39 @@ test_expect_success 'clear default config' '
 	rm -f .git/config
 '

-cat > expect << EOF > +test_expect_success 'initial' '
+	cat >expect <<EOF &&
 [section]
 	penguin = little blue
 EOF
-test_expect_success 'initial' '

Ok.  Correct.  But I see that you are also overall doing a sort of
normalization.

• Remove-tabs if it makes sense
• No variable expansion if it makes sense

And here `<<\EOF` would work too.  Or is that worse style?

I will keep mentioning this throughout the rest.

 	git config ${mode_set} section.penguin "little blue" &&
 	test_cmp expect .git/config
 '

-cat > expect << EOF
+test_expect_success 'mixed case' '
+	cat >expect <<EOF &&
 [section]
 	penguin = little blue
 	Movie = BadPhysics
 EOF
-test_expect_success 'mixed case' '

Ok.  But same as previous.

 	git config ${mode_set} Section.Movie BadPhysics &&
 	test_cmp expect .git/config
 '

-cat > expect << EOF
+test_expect_success 'similar section' '
+	cat >expect <<EOF &&
 [section]
 	penguin = little blue
 	Movie = BadPhysics
 [Sections]
 	WhatEver = Second
 EOF
-test_expect_success 'similar section' '

Ditto.

quoted hunk ↗ jump to hunk

 	git config ${mode_set} Sections.WhatEver Second &&
 	test_cmp expect .git/config
 '

-cat > expect << EOF
+test_expect_success 'uppercase section' '
+	cat >expect <<EOF &&
 [section]
 	penguin = little blue
 	Movie = BadPhysics

@@ -173,7 +174,6 @@ cat > expect << EOF
 [Sections]
 	WhatEver = Second
 EOF
-test_expect_success 'uppercase section' '

Ditto.

quoted hunk ↗ jump to hunk

 	git config ${mode_set} SECTION.UPPERCASE true &&
 	test_cmp expect .git/config
 '

@@ -186,7 +186,8 @@ test_expect_success 'replace with non-match

(actually matching)' '
 	git config section.penguin "very blue" !kingpin
 '

-cat > expect << EOF
+test_expect_success 'append comments' '
+	cat >expect <<EOF &&
 [section]
 	Movie = BadPhysics
 	UPPERCASE = true

@@ -198,8 +199,6 @@ cat > expect << EOF
 [Sections]
 	WhatEver = Second
 EOF
-
-test_expect_success 'append comments' '

Ditto.

quoted hunk ↗ jump to hunk

 	git config --replace-all --comment="Pygoscelis papua" section.penguin
gentoo &&
 	git config ${mode_set} --comment="find fish" section.disposition
peckish &&
 	git config ${mode_set} --comment="#abc" section.foo bar &&

@@ -214,7 +213,9 @@ test_expect_success 'Prohibited LF in comment' '
 	test_must_fail git config ${mode_set} --comment="a${LF}b" section.k v
 '

-test_expect_success 'non-match result' 'test_cmp expect .git/config'
+test_expect_success 'non-match result' '
+	test_cmp expect .git/config
+'

Okay.  You normalize the one line to

    test_expect_success <name> '
         <body>
    '

The same kind of change done in the next patch `t1300: small
style fixups`.

quoted hunk ↗ jump to hunk

 test_expect_success 'find mixed-case key by canonical name' '
 	test_cmp_config Second sections.whatever

@@ -265,14 +266,15 @@ test_expect_success 'unset with cont. lines' '
 	git config ${mode_unset} beta.baz
 '

-cat > expect <<\EOF
-[alpha]
-bar = foo
-[beta]
-foo = bar
-EOF
-
-test_expect_success 'unset with cont. lines is correct' 'test_cmp

expect .git/config'
+test_expect_success 'unset with cont. lines is correct' '
+	cat >expect <<-\EOF &&
+	[alpha]
+	bar = foo
+	[beta]
+	foo = bar
+	EOF
+	test_cmp expect .git/config
+'

Correct.  You eliminate tabs and retain `\`.

quoted hunk ↗ jump to hunk

 cat > .git/config << EOF
 [beta] ; silly comment # another comment

@@ -292,16 +294,15 @@ test_expect_success 'multiple unset' '
 	git config ${mode_unset_all} beta.haha
 '

-cat > expect << EOF
+test_expect_success 'multiple unset is correct' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
 [nextSection] noNewline = ouch
 EOF
-
-test_expect_success 'multiple unset is correct' '
 	test_cmp expect .git/config
 '

Correct.  You replaced `'` with `${SQ}` (I assume “single quote”) which
is probably good style in general in order to avoid toothpicks.

quoted hunk ↗ jump to hunk

@@ -318,37 +319,38 @@ test_expect_success '--replace-all' '
 	git config ${mode_replace_all} beta.haha gamma
 '

-cat > expect << EOF
+test_expect_success 'all replaced' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
 	haha = gamma
 [nextSection] noNewline = ouch
 EOF
-
-test_expect_success 'all replaced' '
 	test_cmp expect .git/config
 '

Correct.

-cat > expect << EOF
+test_expect_success 'really mean test' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
 	haha = alpha
 [nextSection] noNewline = ouch
 EOF
-test_expect_success 'really mean test' '
+

New blank line.  That can be dropped.

quoted hunk ↗ jump to hunk

 	git config ${mode_set} beta.haha alpha &&
 	test_cmp expect .git/config
 '

-cat > expect << EOF
+test_expect_success 'really really mean test' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment

@@ -356,7 +358,6 @@ noIndent= sillyValue ; 'nother silly comment
 [nextSection]
 	nonewline = wow
 EOF
-test_expect_success 'really really mean test' '
 	git config ${mode_set} nextsection.nonewline wow &&
 	test_cmp expect .git/config
 '

Huh, the similarity between “really” and “really really” confused me.
But correct.

quoted hunk ↗ jump to hunk

@@ -365,23 +366,24 @@ test_expect_success 'get value' '
 	test_cmp_config alpha beta.haha
 '

-cat > expect << EOF
+test_expect_success 'unset' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
 [nextSection]
 	nonewline = wow
 EOF
-test_expect_success 'unset' '
 	git config ${mode_unset} beta.haha &&
 	test_cmp expect .git/config
 '

Correct.

quoted hunk ↗ jump to hunk

-cat > expect << EOF
+test_expect_success 'multivar' '
+	cat  >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment

@@ -389,7 +391,6 @@ noIndent= sillyValue ; 'nother silly comment
 	nonewline = wow
 	NoNewLine = wow2 for me
 EOF
-test_expect_success 'multivar' '
 	git config nextsection.NoNewLine "wow2 for me" "for me$" &&
 	test_cmp expect .git/config
 '
@@ -415,9 +416,10 @@ test_expect_success 'multi-valued get-all returns all' '
 	test_cmp expect actual
 '

Correct.

quoted hunk ↗ jump to hunk

-cat > expect << EOF
+test_expect_success 'multivar replace' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment

@@ -425,7 +427,6 @@ noIndent= sillyValue ; 'nother silly comment
 	nonewline = wow3
 	NoNewLine = wow2 for me
 EOF
-test_expect_success 'multivar replace' '
 	git config nextsection.nonewline "wow3" "wow$" &&
 	test_cmp expect .git/config
 '

Correct.

quoted hunk ↗ jump to hunk

@@ -438,17 +439,16 @@ test_expect_success 'invalid unset' '
 	test_must_fail git config ${mode_unset} somesection.nonewline
 '

-cat > expect << EOF
+test_expect_success 'multivar unset' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
 [nextSection]
 	NoNewLine = wow2 for me
 EOF
-
-test_expect_success 'multivar unset' '
 	case "$mode" in
 	legacy)
 		git config --unset nextsection.nonewline "wow3$";;

Correct.

quoted hunk ↗ jump to hunk

@@ -466,9 +466,10 @@ test_expect_success 'hierarchical section' '
 	git config Version.1.2.3eX.Alpha beta
 '

-cat > expect << EOF
+test_expect_success 'hierarchical section value' '
+	cat >expect <<EOF &&
 [beta] ; silly comment # another comment
-noIndent= sillyValue ; 'nother silly comment
+noIndent= sillyValue ; ${SQ}nother silly comment

 # empty line
 		; comment
@@ -479,19 +480,16 @@ noIndent= sillyValue ; 'nother silly comment
 [Version "1.2.3eX"]
 	Alpha = beta
 EOF
-
-test_expect_success 'hierarchical section value' '
 	test_cmp expect .git/config
 '

Correct.

-cat > expect << EOF
-beta.noindent=sillyValue
-nextsection.nonewline=wow2 for me
-123456.a123=987
-version.1.2.3eX.alpha=beta
-EOF
-
 test_expect_success 'working --list' '
+	cat >expect <<-\EOF &&
+	beta.noindent=sillyValue
+	nextsection.nonewline=wow2 for me
+	123456.a123=987
+	version.1.2.3eX.alpha=beta
+	EOF
 	git config ${mode_prefix}list > output &&
 	test_cmp expect output
 '

Correct.  Removing tabs now that you can.  Also no variable expansion.

quoted hunk ↗ jump to hunk

@@ -500,44 +498,40 @@ test_expect_success '--list without repo produces

empty output' '
 	test_must_be_empty output
 '

-cat > expect << EOF
-beta.noindent
-nextsection.nonewline
-123456.a123
-version.1.2.3eX.alpha
-EOF
-
 test_expect_success '--name-only --list' '
+	cat >expect <<-EOF &&
+	beta.noindent
+	nextsection.nonewline
+	123456.a123
+	version.1.2.3eX.alpha
+	EOF
 	git config ${mode_prefix}list --name-only >output &&
 	test_cmp expect output
 '

Correct.  But you can use `<<-\EOF`.

-cat > expect << EOF
-beta.noindent sillyValue
-nextsection.nonewline wow2 for me
-EOF
-
 test_expect_success '--get-regexp' '
+	cat >expect <<-EOF &&
+	beta.noindent sillyValue
+	nextsection.nonewline wow2 for me
+	EOF
 	git config ${mode_get_regexp} in >output &&
 	test_cmp expect output
 '

Ditto.

-cat > expect << EOF
-beta.noindent
-nextsection.nonewline
-EOF
-
 test_expect_success '--name-only --get-regexp' '
+	cat >expect <<-EOF &&
+	beta.noindent
+	nextsection.nonewline
+	EOF
 	git config ${mode_get_regexp} --name-only in >output &&
 	test_cmp expect output
 '

Ditto.

-cat > expect << EOF
-wow2 for me
-wow4 for you
-EOF
-
 test_expect_success '--add' '
+	cat >expect <<-EOF &&
+	wow2 for me
+	wow4 for you
+	EOF
 	git config --add nextsection.nonewline "wow4 for you" &&
 	git config ${mode_get_all} nextsection.nonewline > output &&
 	test_cmp expect output

Ditto.

quoted hunk ↗ jump to hunk

@@ -558,37 +552,32 @@ test_expect_success 'get variable with empty value' '
 	git config --get emptyvalue.variable ^$
 '

-echo novalue.variable > expect
-
 test_expect_success 'get-regexp variable with no value' '
+	echo novalue.variable >expect &&
 	git config ${mode_get_regexp} novalue > output &&
 	test_cmp expect output
 '

Correct.

-echo 'novalue.variable true' > expect
-
 test_expect_success 'get-regexp --bool variable with no value' '
+	echo "novalue.variable true" >expect &&
 	git config ${mode_get_regexp} --bool novalue > output &&
 	test_cmp expect output
 '

Correct.

-echo 'emptyvalue.variable ' > expect
-
 test_expect_success 'get-regexp variable with empty value' '
+	echo "emptyvalue.variable " >expect &&
 	git config ${mode_get_regexp} emptyvalue > output &&
 	test_cmp expect output
 '

Correct.

-echo true > expect
-
 test_expect_success 'get bool variable with no value' '
+	echo true >expect &&
 	git config --bool novalue.variable > output &&
 	test_cmp expect output
 '

Correct.

-echo false > expect
-
 test_expect_success 'get bool variable with empty value' '
+	echo false > expect &&
 	git config --bool emptyvalue.variable > output &&
 	test_cmp expect output
 '

Here you should use `>expect`.

quoted hunk ↗ jump to hunk

@@ -604,19 +593,19 @@ cat > .git/config << EOF
 	c = d
 EOF

-cat > expect << EOF
+test_expect_success 'new section is partial match of another' '
+	cat >expect <<EOF &&
 [a.b]
 	c = d
 [a]
 	x = y
 EOF
-
-test_expect_success 'new section is partial match of another' '
 	git config a.x y &&
 	test_cmp expect .git/config
 '

You can use `<<\EOF`.

quoted hunk ↗ jump to hunk

-cat > expect << EOF
+test_expect_success 'new variable inserts into proper section' '
+	cat >expect <<EOF &&
 [a.b]
 	c = d
 [a]

@@ -625,8 +614,6 @@ cat > expect << EOF
 [b]
 	x = y
 EOF
-
-test_expect_success 'new variable inserts into proper section' '
 	git config b.x y &&
 	git config a.b c &&
 	test_cmp expect .git/config

Correct.  You can use `<<\EOF`.

quoted hunk ↗ jump to hunk

@@ -642,11 +629,10 @@ cat > other-config << EOF
 	bahn = strasse
 EOF

-cat > expect << EOF
-ein.bahn=strasse
-EOF
-
 test_expect_success 'alternative GIT_CONFIG' '
+	cat >expect <<-EOF &&
+	ein.bahn=strasse
+	EOF

Ditto.

quoted hunk ↗ jump to hunk

 	GIT_CONFIG=other-config git config ${mode_prefix}list >output &&
 	test_cmp expect output
 '

@@ -675,14 +661,13 @@ test_expect_success 'refer config from subdirectory' '
 	test_cmp_config -C x strasse --file=../other-config --get ein.bahn
 '

-cat > expect << EOF
+test_expect_success '--set in alternative file' '
+	cat >expect <<\EOF &&
 [ein]
 	bahn = strasse
 [anwohner]
 	park = ausweis
 EOF
-
-test_expect_success '--set in alternative file' '
 	git config --file=other-config anwohner.park ausweis &&
 	test_cmp expect other-config
 '

Correct.  Here you do `<< EOF` → `<<\EOF`.

quoted hunk ↗ jump to hunk

@@ -730,7 +715,8 @@ test_expect_success 'rename another section' '
 	git config ${mode_prefix}rename-section branch."1 234 blabl/a" branch.drei
 '

-cat > expect << EOF
+test_expect_success 'rename succeeded' '
+	cat >expect <<\EOF &&
 # Hallo
 	#Bello
 [branch "zwei"]
@@ -740,8 +726,6 @@ cat > expect << EOF
 [branch "drei"]
 weird
 EOF
-
-test_expect_success 'rename succeeded' '
 	test_cmp expect .git/config
 '

Ditto.

(That four tests are named `rename succeeded` is a bit disorienting.)

quoted hunk ↗ jump to hunk

@@ -753,7 +737,8 @@ test_expect_success 'rename a section with a var on

the same line' '
 	git config ${mode_prefix}rename-section branch.vier branch.zwei
 '

-cat > expect << EOF
+test_expect_success 'rename succeeded' '
+	cat >expect <<\EOF &&
 # Hallo
 	#Bello
 [branch "zwei"]

@@ -765,8 +750,6 @@ weird
 [branch "zwei"]
 	z = 1
 EOF
-
-test_expect_success 'rename succeeded' '
 	test_cmp expect .git/config
 '

Ditto.

quoted hunk ↗ jump to hunk

@@ -816,32 +799,29 @@ test_expect_success 'remove section' '
 	git config ${mode_prefix}remove-section branch.zwei
 '

-cat > expect << EOF
+test_expect_success 'section was removed properly' '
+	cat >expect <<\EOF &&
 # Hallo
 	#Bello
 [branch "drei"]
 weird
 EOF
-
-test_expect_success 'section was removed properly' '
 	test_cmp expect .git/config
 '

Ditto.

-cat > expect << EOF
+test_expect_success 'section ending' '
+	cat >expect <<\EOF &&
 [gitcvs]
 	enabled = true
 	dbname = %Ggitcvs2.%a.%m.sqlite
 [gitcvs "ext"]
 	dbname = %Ggitcvs1.%a.%m.sqlite
 EOF
-
-test_expect_success 'section ending' '
 	rm -f .git/config &&
 	git config ${mode_set} gitcvs.enabled true &&
 	git config ${mode_set} gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
 	git config ${mode_set} gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
 	test_cmp expect .git/config
-
 '

Ditto.  And normalized blank lines, that’s good.

quoted hunk ↗ jump to hunk

 test_expect_success numbers '

@@ -885,19 +865,17 @@ test_expect_success 'invalid stdin config' '
 	test_grep "bad config line 1 in standard input" output
 '

-cat > expect << EOF
-true
-false
-true
-false
-true
-false
-true
-false
-EOF
-
 test_expect_success bool '
-
+	cat >expect <<-\EOF &&
+	true
+	false
+	true
+	false
+	true
+	false
+	true
+	false
+	EOF
 	git config ${mode_set} bool.true1 01 &&
 	git config ${mode_set} bool.true2 -1 &&
 	git config ${mode_set} bool.true3 YeS &&

Correct.

quoted hunk ↗ jump to hunk

@@ -923,7 +901,8 @@ test_expect_success 'invalid bool (set)' '

 	test_must_fail git config --bool bool.nobool foobar'

-cat > expect <<\EOF
+test_expect_success 'set --bool' '
+	cat >expect<<\EOF &&
 [bool]
 	true1 = true
 	true2 = true
@@ -934,9 +913,6 @@ cat > expect <<\EOF
 	false3 = false
 	false4 = false
 EOF
-
-test_expect_success 'set --bool' '
-
 	rm -f .git/config &&
 	git config --bool bool.true1 01 &&
 	git config --bool bool.true2 -1 &&

Correct.  But add a space? (>expect<<\EOF)

quoted hunk ↗ jump to hunk

@@ -948,15 +924,13 @@ test_expect_success 'set --bool' '
 	git config --bool bool.false4 FALSE &&
 	test_cmp expect .git/config'

-cat > expect <<\EOF
+test_expect_success 'set --int' '
+	cat >expect <<\EOF &&
 [int]
 	val1 = 1
 	val2 = -1
 	val3 = 5242880
 EOF
-
-test_expect_success 'set --int' '
-
 	rm -f .git/config &&
 	git config --int int.val1 01 &&
 	git config --int int.val2 -1 &&

Correct.

quoted hunk ↗ jump to hunk

@@ -994,7 +968,8 @@ test_expect_success 'get --bool-or-int' '
 	test_cmp expect actual
 '

-cat >expect <<\EOF
+test_expect_success 'set --bool-or-int' '
+	cat >expect <<\EOF &&
 [bool]
 	true1 = true
 	false1 = false
@@ -1005,8 +980,6 @@ cat >expect <<\EOF
 	int2 = 1
 	int3 = -1
 EOF
-
-test_expect_success 'set --bool-or-int' '
 	rm -f .git/config &&
 	git config --bool-or-int bool.true1 true &&
 	git config --bool-or-int bool.false1 false &&

Correct.

I tried with here `<<-\EOF` but that made something fail. :)

quoted hunk ↗ jump to hunk

@@ -1018,14 +991,13 @@ test_expect_success 'set --bool-or-int' '
 	test_cmp expect .git/config
 '

-cat >expect <<\EOF
+test_expect_success !MINGW 'set --path' '
+	cat >expect <<\EOF &&
 [path]
 	home = ~/
 	normal = /dev/null
 	trailingtilde = foo~
 EOF
-
-test_expect_success !MINGW 'set --path' '
 	rm -f .git/config &&
 	git config --path path.home "~/" &&
 	git config --path path.normal "/dev/null" &&

Correct.

quoted hunk ↗ jump to hunk

@@ -1037,25 +1009,23 @@ then
 	test_set_prereq HOMEVAR
 fi

-cat >expect <<EOF
-$HOME/
-/dev/null
-foo~
-EOF
-
 test_expect_success HOMEVAR 'get --path' '
+	cat >expect <<-EOF &&
+	$HOME/
+	/dev/null
+	foo~
+	EOF
 	git config --get --path path.home > result &&
 	git config --get --path path.normal >> result &&
 	git config --get --path path.trailingtilde >> result &&
 	test_cmp expect result
 '

Correct.

-cat >expect <<\EOF
-/dev/null
-foo~
-EOF
-
 test_expect_success !MINGW 'get --path copes with unset $HOME' '
+	cat >expect <<-\EOF &&
+	/dev/null
+	foo~
+	EOF
 	(
 		sane_unset HOME &&
 		test_must_fail git config --get --path path.home \

Correct.

quoted hunk ↗ jump to hunk

@@ -1112,12 +1082,11 @@ test_expect_success 'get --type=color' '
 	test_cmp expect actual
 '

-cat >expect << EOF
+test_expect_success 'set --type=color' '
+	cat >expect <<EOF &&
 [foo]
 	color = red
 EOF
-
-test_expect_success 'set --type=color' '
 	rm .git/config &&
 	git config --type=color foo.color "red" &&
 	test_cmp expect .git/config

Correct.  You can use `<<\EOF`.

quoted hunk ↗ jump to hunk

@@ -1133,14 +1102,14 @@ test_expect_success 'set --type=color barfs on

non-color' '
 	test_grep "cannot parse color" error
 '

-cat > expect << EOF
+test_expect_success 'quoting' '
+	cat >expect <<EOF &&
 [quote]
 	leading = " test"
 	ending = "test "
 	semicolon = "test;test"
 	hash = "test#test"
 EOF
-test_expect_success 'quoting' '
 	rm -f .git/config &&
 	git config ${mode_set} quote.leading " test" &&
 	git config ${mode_set} quote.ending "test " &&

Correct.  You can use `<<\EOF`.

quoted hunk ↗ jump to hunk

@@ -1166,13 +1135,12 @@ inued
 inued"
 EOF

-cat > expect <<\EOF
+test_expect_success 'value continued on next line' '
+	cat >expect <<\EOF &&
 section.continued=continued
 section.noncont=not continued
 section.quotecont=cont;inued
 EOF
-
-test_expect_success 'value continued on next line' '
 	git config ${mode_prefix}list > result &&
 	test_cmp expect result
 '

Correct.  You can use

	cat >expect <<-\EOF &&
	section.continued=continued
	section.noncont=not continued
	section.quotecont=cont;inued
	EOF

--
2.51.0.450.g87641ccf93.dirty

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help