Re: [PATCH v11 1/4] test-parse-options: print quiet as integer

2016-03-31 Thread Pranit Bauva 
On Thu, Mar 31, 2016 at 11:49 PM, Junio C Hamano  wrote:
> Pranit Bauva  writes:
>
>> Current implementation of parse-options.c treats OPT__QUIET() as integer
>> and not boolean and thus it is more appropriate to print it as integer
>> to avoid confusion.
>>
>> While at it, fix some style issues.
>
> I counted the changes in t0040 and you have _more_ style fixes than
> the real change.  That is not "while at it".
>
> While I welcome the style fix, it is better done as a preparatory
> clean-up step before the real change.

Okay. I thought this was a minor change so I squashed it together. I
will separate it though.

> Missing sign-off.

Will include this

>> -cat > typo.err << EOF
>> +cat >typo.err <>  error: did you mean \`--boolean\` (with two dashes ?)
>>  EOF
>
> If your "style cleanup" patch were separate, you could fix this (and
> other that have backslash escape inside the here-document) further
> to something like this:
>
> cat >type.err <<\EOF
> error: did you mean `--boolean` (with two dashes ?)
> EOF
>
> Thanks.

Will include this.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v11 1/4] test-parse-options: print quiet as integer

2016-03-31 Thread Junio C Hamano 
Pranit Bauva  writes:

> Current implementation of parse-options.c treats OPT__QUIET() as integer
> and not boolean and thus it is more appropriate to print it as integer
> to avoid confusion.
>
> While at it, fix some style issues.

I counted the changes in t0040 and you have _more_ style fixes than
the real change.  That is not "while at it".

While I welcome the style fix, it is better done as a preparatory
clean-up step before the real change.

> ---

Missing sign-off.

> -cat > typo.err << EOF
> +cat >typo.err <  error: did you mean \`--boolean\` (with two dashes ?)
>  EOF

If your "style cleanup" patch were separate, you could fix this (and
other that have backslash escape inside the here-document) further
to something like this:

cat >type.err <<\EOF
error: did you mean `--boolean` (with two dashes ?)
EOF

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v11 1/4] test-parse-options: print quiet as integer

2016-03-31 Thread Pranit Bauva 
Current implementation of parse-options.c treats OPT__QUIET() as integer
and not boolean and thus it is more appropriate to print it as integer
to avoid confusion.

While at it, fix some style issues.
---
 t/t0040-parse-options.sh | 94 
 test-parse-options.c |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 9be6411..2dcbdc0 100755
--- 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 <
 
 --yes get a boolean
@@ -49,7 +49,7 @@ Standard options
 EOF
 
 test_expect_success 'test help' '
-   test_must_fail test-parse-options -h > output 2> output.err &&
+   test_must_fail test-parse-options -h >output 2>output.err &&
test_must_be_empty output.err &&
test_i18ncmp expect output
 '
@@ -64,7 +64,7 @@ timestamp: 0
 string: (not set)
 abbrev: 7
 verbose: 0
-quiet: no
+quiet: 0
 dry run: no
 file: (not set)
 EOF
@@ -156,7 +156,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' '
check magnitude: 3221225472 -m 3g
 '
 
-cat > expect << EOF
+cat >expect < expect << EOF
+cat >expect < expect << EOF
+cat >expect < output 2> output.err &&
+   >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > expect << EOF
+cat >expect < output 2> output.err &&
+   test-parse-options --int 2 --boolean --no-bo >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
 test_expect_success 'unambiguously abbreviated option with "="' '
-   test-parse-options --int=2 > output 2> output.err &&
+   test-parse-options --int=2 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
@@ -256,7 +256,7 @@ test_expect_success 'ambiguously abbreviated option' '
test_expect_code 129 test-parse-options --strin 123
 '
 
-cat > expect << EOF
+cat >expect < output 2> output.err &&
+   test-parse-options --st 123 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > typo.err << EOF
+cat >typo.err < output 2> output.err &&
+   test_must_fail test-parse-options -boolean >output 2>output.err &&
test_must_be_empty output &&
test_cmp typo.err output.err
 '
 
-cat > typo.err << EOF
+cat >typo.err < output 2> output.err &&
+   test_must_fail test-parse-options -ambiguous >output 2>output.err &&
test_must_be_empty output &&
test_cmp typo.err output.err
 '
 
-cat > expect  output.err &&
+   test-parse-options --quux >output 2>output.err &&
test_must_be_empty output.err &&
-test_cmp expect output
+   test_cmp expect output
 '
 
-cat > expect  output.err &&
+   foo -q >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > expect  output.err &&
+   test-parse-options --length=four -b -4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > expect  output.err &&
+   test_must_fail test-parse-options --no-length >output 2>output.err &&
test_i18ncmp expect output &&
test_i18ncmp expect.err output.err
 '
 
-cat > expect  output.err &&
+   test-parse-options --set23 -b --no-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
-   test-parse-options --set23 -b --neg-or4 > output 2> output.err &&
+   test-parse-options --set23 -b --neg-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > expect  output.err &&
+   test-parse-options -bb --or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
 test_expect_success 'OPT_NEGBIT() works' '
-   test-parse-options -bb --no-neg-or4 > output 2> output.err &&
+   test-parse-options -bb --no-neg-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
-   test-parse-options + + + + + + > output 2> output.err &&
+   test-parse-options + + + + + + >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
 
-cat > expect  output.err &&
+   test-parse-options -12345 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
 '
@@ -449,7 +449,7 @@ timestamp: 0
 string: (not set)
 abbrev: 7
 verbose: 0
-quiet: no
+quiet: 0
 dry run