kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t1502: protect runs of SPs used in the indentation 

The expected output from the argument help use runs of SPs to align
the description of each option; a careless use of --whitespace=fix
can turn leading parts of them into appropriate number of HTs.
Prevent such a breakage by prefixing all the expected lines with
leading vertical bars in the original and stripping them with a
small sed script.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2014-03-23 15:26:36 -07:00
parent 9bab5b6061
commit ce7f8745aa
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
t/t1502-rev-parse-parseopt.sh
View File

@ -3,64 +3,64 @@
test_description='test git rev-parse --parseopt' test_description='test git rev-parse --parseopt'
. ./test-lib.sh . ./test-lib.sh


cat > expect <<\END_EXPECT sed -e 's/^|//' >expect <<\END_EXPECT
cat <<\EOF |cat <<\EOF
usage: some-command [options] <args>... |usage: some-command [options] <args>...

|
some-command does foo and bar! | some-command does foo and bar!

|
-h, --help show the help | -h, --help show the help
--foo some nifty option --foo | --foo some nifty option --foo
--bar ... some cool option --bar with an argument | --bar ... some cool option --bar with an argument
-b, --baz a short and long option | -b, --baz a short and long option

|
An option group Header |An option group Header
-C[...] option C with an optional argument | -C[...] option C with an optional argument
-d, --data[=...] short and long option with an optional argument | -d, --data[=...] short and long option with an optional argument

|
Argument hints |Argument hints
-b <arg> short option required argument | -b <arg> short option required argument
--bar2 <arg> long option required argument | --bar2 <arg> long option required argument
-e, --fuz <with-space> | -e, --fuz <with-space>
short and long option required argument | short and long option required argument
-s[<some>] short option optional argument | -s[<some>] short option optional argument
--long[=<data>] long option optional argument | --long[=<data>] long option optional argument
-g, --fluf[=<path>] short and long option optional argument | -g, --fluf[=<path>] short and long option optional argument
--longest <very-long-argument-hint> | --longest <very-long-argument-hint>
a very long argument hint | a very long argument hint

|
Extras |Extras
--extra1 line above used to cause a segfault but no longer does | --extra1 line above used to cause a segfault but no longer does

|
EOF |EOF
END_EXPECT END_EXPECT


cat > optionspec << EOF sed -e 's/^|//' >optionspec <<\EOF
some-command [options] <args>... |some-command [options] <args>...

|
some-command does foo and bar! |some-command does foo and bar!
-- |--
h,help show the help |h,help show the help

|
foo some nifty option --foo |foo some nifty option --foo
bar= some cool option --bar with an argument |bar= some cool option --bar with an argument
b,baz a short and long option |b,baz a short and long option

|
An option group Header | An option group Header
C? option C with an optional argument |C? option C with an optional argument
d,data? short and long option with an optional argument |d,data? short and long option with an optional argument

|
Argument hints | Argument hints
b=arg short option required argument |b=arg short option required argument
bar2=arg long option required argument |bar2=arg long option required argument
e,fuz=with-space short and long option required argument |e,fuz=with-space short and long option required argument
s?some short option optional argument |s?some short option optional argument
long?data long option optional argument |long?data long option optional argument
g,fluf?path short and long option optional argument |g,fluf?path short and long option optional argument
longest=very-long-argument-hint a very long argument hint |longest=very-long-argument-hint a very long argument hint

|
Extras |Extras
extra1 line above used to cause a segfault but no longer does |extra1 line above used to cause a segfault but no longer does
EOF EOF


test_expect_success 'test --parseopt help output' ' test_expect_success 'test --parseopt help output' '