On Tue, May 7, 2019 at 10:43 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > -- >8 -- > Subject: t0040: protect lines that are indented by spaces > > This block is byte-for-byte identical expected output, that contains a > few lines that are indented in many spaces, which makes "git diff --check" > unhappy and will break the test when "git am --whitespace=fix" is > allowed to "correct" them. > > Protect the left edge with a marker character, and strip it with > sed, which is used as a standard way to deal with this issue in our > test suite. > > Signed-off-by: Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > * Of course, if the right-edge need to be protected, we can do so > as well. > > t/t0040-parse-options.sh | 94 ++++++++++++++++++++++++------------------------ > 1 file changed, 47 insertions(+), 47 deletions(-) > > diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh > index cebc77fab0..26373b5b72 100755 > --- a/t/t0040-parse-options.sh > +++ b/t/t0040-parse-options.sh > @@ -7,53 +7,53 @@ test_description='our own option parser' > > . ./test-lib.sh > > -cat >expect <<\EOF > -usage: test-tool parse-options <options> > - > - A helper function for the parse-options API. > - > - --yes get a boolean > - -D, --no-doubt begins with 'no-' > - -B, --no-fear be brave > - -b, --boolean increment by one > - -4, --or4 bitwise-or boolean with ...0100 > - --neg-or4 same as --no-or4 > - > - -i, --integer <n> get a integer > - -j <n> get a integer, too > - -m, --magnitude <n> get a magnitude > - --set23 set integer to 23 > - -L, --length <str> get length of <str> > - -F, --file <file> set file to <file> > - > -String options > - -s, --string <string> > - get a string > - --string2 <str> get another string > - --st <st> get another string (pervert ordering) > - -o <str> get another string > - --list <str> add str to list > - > -Magic arguments > - --quux means --quux > - -NUM set integer to NUM > - + same as -b > - --ambiguous positive ambiguity > - --no-ambiguous negative ambiguity > - > -Standard options > - --abbrev[=<n>] use <n> digits to display SHA-1s > - -v, --verbose be verbose > - -n, --dry-run dry run > - -q, --quiet be quiet > - --expect <string> expected output in the variable dump > - > -Alias > - -A, --alias-source <string> > - get a string > - -Z, --alias-target <string> > - get a string > - > +sed -e 's/^|//' >expect <<\EOF I think we already use qz_to_tab_space to protect leading spaces (t1450) or trailing ones (t4205). It's less strict than this though. Anyway, if you go with 's/^|//', maybe make it a helper function too because I'm pretty sure we have more text like this in the test suite. There's also the "tr -d Q" trick in t4038. But that's something to clean up if someone really have free time. > +|usage: test-tool parse-options <options> > +| > +| A helper function for the parse-options API. > +| > +| --yes get a boolean > +| -D, --no-doubt begins with 'no-' > +| -B, --no-fear be brave > +| -b, --boolean increment by one > +| -4, --or4 bitwise-or boolean with ...0100 > +| --neg-or4 same as --no-or4 > +| > +| -i, --integer <n> get a integer > +| -j <n> get a integer, too > +| -m, --magnitude <n> get a magnitude > +| --set23 set integer to 23 > +| -L, --length <str> get length of <str> > +| -F, --file <file> set file to <file> > +| > +|String options > +| -s, --string <string> > +| get a string > +| --string2 <str> get another string > +| --st <st> get another string (pervert ordering) > +| -o <str> get another string > +| --list <str> add str to list > +| > +|Magic arguments > +| --quux means --quux > +| -NUM set integer to NUM > +| + same as -b > +| --ambiguous positive ambiguity > +| --no-ambiguous negative ambiguity > +| > +|Standard options > +| --abbrev[=<n>] use <n> digits to display SHA-1s > +| -v, --verbose be verbose > +| -n, --dry-run dry run > +| -q, --quiet be quiet > +| --expect <string> expected output in the variable dump > +| > +|Alias > +| -A, --alias-source <string> > +| get a string > +| -Z, --alias-target <string> > +| get a string > +| > EOF > > test_expect_success 'test help' ' -- Duy
