diff options
| author | Giuseppe Scrivano <gscrivano@gnu.org> | 2010-05-17 17:34:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-31 18:06:41 -0700 |
| commit | 9c7304e3e39ed397b3cc6566573333e2698a52b4 (patch) | |
| tree | fb0b9f66cd82761e67ae77074c973acb4bf6fa1a /t | |
| parent | 81fa024cd8e336ba257f13fe7724b95baacfa3ad (diff) | |
| download | git-9c7304e3e39ed397b3cc6566573333e2698a52b4.tar.gz | |
print the usage string on stdout instead of stderr
When -h is used, print usage messages on stdout. If a command is invoked with
wrong arguments then print the usage messages on stderr.
Signed-off-by: Giuseppe Scrivano <gscrivano@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0040-parse-options.sh | 8 | ||||
| -rwxr-xr-x | t/t1502-rev-parse-parseopt.sh | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 3d450ed379..20924506af 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.err << EOF +cat > expect << EOF usage: test-parse-options <options> -b, --boolean get a boolean @@ -46,10 +46,12 @@ EOF test_expect_success 'test help' ' test_must_fail test-parse-options -h > output 2> output.err && - test ! -s output && - test_cmp expect.err output.err + test ! -s output.err && + test_cmp expect output ' +mv expect expect.err + cat > expect << EOF boolean: 2 integer: 1729 diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index e504058062..660487dc08 100755 --- a/t/t1502-rev-parse-parseopt.sh +++ b/t/t1502-rev-parse-parseopt.sh @@ -3,7 +3,7 @@ test_description='test git rev-parse --parseopt' . ./test-lib.sh -cat > expect.err <<EOF +cat > expect <<EOF usage: some-command [options] <args>... some-command does foo and bar! @@ -38,8 +38,8 @@ extra1 line above used to cause a segfault but no longer does EOF test_expect_success 'test --parseopt help output' ' - git rev-parse --parseopt -- -h 2> output.err < optionspec - test_cmp expect.err output.err + git rev-parse --parseopt -- -h > output < optionspec + test_cmp expect output ' cat > expect <<EOF |