undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ow/rev-parse-parseopt-fix'

Browse Source 
The parser in the script interface to parse-options in "git
rev-parse" has been updated to diagnose a bogus input correctly.

* ow/rev-parse-parseopt-fix:
  rev-parse --parseopt: detect missing opt-spec
This commit is contained in:
Junio C Hamano 2022-09-13 11:38:25 -07:00
commit de1fee2f1e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rev-parse.c
View File

@ -479,6 +479,9 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
if (!s) if (!s)
s = help; s = help;
if (s == sb.buf)
die(_("missing opt-spec before option flags"));
if (s - sb.buf == 1) /* short option only */ if (s - sb.buf == 1) /* short option only */
o->short_name = *sb.buf; o->short_name = *sb.buf;
else if (sb.buf[1] != ',') /* long option only */ else if (sb.buf[1] != ',') /* long option only */

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

@ -306,6 +306,13 @@ test_expect_success 'test --parseopt help output: "wrapped" options normal "or:"
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'test --parseopt invalid opt-spec' '
test_write_lines x -- "=, x" >spec &&
echo "fatal: missing opt-spec before option flags" >expect &&
test_must_fail git rev-parse --parseopt -- >out <spec 2>err &&
test_cmp expect err
'
test_expect_success 'test --parseopt help output: multi-line blurb after empty line' ' test_expect_success 'test --parseopt help output: multi-line blurb after empty line' '
sed -e "s/^|//" >spec <<-\EOF && sed -e "s/^|//" >spec <<-\EOF &&
|cmd [--some-option] |cmd [--some-option]