Christian Couder
88249755a4
In "git.c", the other `handle_options()` options that take their value as a separate argument, like `--git-dir`, `--namespace` or `-C`, check that such an argument actually exists before using it, and error out with a message and the usage string otherwise. The `--shallow-file` option doesn't perform that check. It blindly advances past the option and then dereferences the next element of `argv`, which is the NULL terminator when no value was given. So `git --shallow-file` segfaults: $ git --shallow-file Segmentation fault (core dumped) Let's fix that by checking that a value was given, in the same way and with a message worded like the ones the other options use. While at it, let's also set the environment variable before advancing past the option, instead of advancing first and using `(*argv)[0]`, so that this option looks like the other ones. Note that all the in-tree callers passing `--shallow-file` to a `git` subprocess always pass a value after it, so they are not affected. In `upload-pack.c` that value is an empty string, which is still accepted. Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
118 lines
3.4 KiB
Bash
Executable File
118 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test commands behavior when given invalid argument value'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup ' '
|
|
test_commit "v1.0"
|
|
'
|
|
|
|
test_expect_success 'tag --contains <existent_tag>' '
|
|
git tag --contains "v1.0" >actual 2>actual.err &&
|
|
test_grep "v1.0" actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'tag --contains <inexistent_tag>' '
|
|
test_must_fail git tag --contains "notag" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'tag --no-contains <existent_tag>' '
|
|
git tag --no-contains "v1.0" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'tag --no-contains <inexistent_tag>' '
|
|
test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'tag usage error' '
|
|
test_must_fail git tag --noopt >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'branch --contains <existent_commit>' '
|
|
git branch --contains "main" >actual 2>actual.err &&
|
|
test_grep "main" actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'branch --contains <inexistent_commit>' '
|
|
test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains <existent_commit>' '
|
|
git branch --no-contains "main" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'branch --no-contains <inexistent_commit>' '
|
|
test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'branch usage error' '
|
|
test_must_fail git branch --noopt >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --contains <existent_object>' '
|
|
git for-each-ref --contains "main" >actual 2>actual.err &&
|
|
test_line_count = 2 actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --contains <inexistent_object>' '
|
|
test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --no-contains <existent_object>' '
|
|
git for-each-ref --no-contains "main" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_line_count = 0 actual.err
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --no-contains <inexistent_object>' '
|
|
test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "error" actual.err &&
|
|
test_grep ! "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'for-each-ref usage error' '
|
|
test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "usage" actual.err
|
|
'
|
|
|
|
test_expect_success 'git --shallow-file without a value' '
|
|
test_must_fail git --shallow-file >actual 2>actual.err &&
|
|
test_line_count = 0 actual &&
|
|
test_grep "no file given for " actual.err &&
|
|
test_grep "usage" actual.err
|
|
'
|
|
|
|
test_done
|