On Mon, Apr 4, 2016 at 2:30 AM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva <pranit.bauva@xxxxxxxxx> wrote: >> Signed-off-by: Pranit Bauva <pranit.bauva@xxxxxxxxx> >> --- >> diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh >> @@ -7,7 +7,7 @@ test_description='our own option parser' >> >> . ./test-lib.sh >> >> -cat > expect << EOF >> +cat >expect <<EOF >> usage: test-parse-options <options> >> --yes get a boolean > > It would be better to use <<\EOF for this one to make it clear that no > interpolation is desired in the heredoc. > >> @@ -156,7 +156,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' ' >> check magnitude: 3221225472 -m 3g >> ' >> >> -cat > expect << EOF >> +cat >expect <<EOF > > Ditto: <<\EOF > > Same applies to all similar heredocs in subsequent tests where > interpolation is not desired. > >> boolean: 2 >> integer: 1729 >> magnitude: 16384 >> @@ -310,12 +310,12 @@ arg 00: --quux >> EOF >> >> test_expect_success 'keep some options as arguments' ' >> - test-parse-options --quux > output 2> output.err && >> + test-parse-options --quux >output 2>output.err && >> test_must_be_empty output.err && >> - test_cmp expect output >> + test_cmp expect output > > Okay, this is a whitespace change (spaces -> tab). > >> ' >> @@ -460,7 +460,7 @@ test_expect_success 'negation of OPT_NONEG flags is not ambiguous' ' >> -cat >>expect <<'EOF' >> +cat >>expect <<EOF > > This is not a desirable change. This heredoc does not require > interpolation, so you don't want to turn it into a form which does > interpolate. For style consistency, therefore, you should change 'EOF' > to \EOF. > >> list: foo >> list: bar >> list: baz Okay I will do the change. I was previously unaware about the use of '\' before EOF. I googled it now. But I am still confused about its use in this scenario. Upto what I understood, it is used where you want to expand a variable, substitute a command, arithmethic expansion. The use of '\' in the tests I have changed in v12 wrt 11 is understood by me as you want to remove the use of escape sequences which is justified. But this seems a bit vague. Is it some convention in git? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html