Skip to content

parse-options.c: display subcommands properly in check_typos #2084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aubymori wants to merge 1 commit into
base: master
Choose a base branch
from
Open

parse-options.c: display subcommands properly in check_typos #2084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
parse-options.c: display subcommands properly in check_typos 
Before this, mistyping a subcommand with one dash (e.g. `git stash -list`)
would display a message telling the user to try it with two dashes.
Since subcommands are parsed with no dashes, this is incorrect and simply
results in the help message for that command being shown.

This commit changes check_typos to check the command type and display a
proper message for subcommands.

Signed-off-by: aubymori <aubyomori@gmail.com>
  • Loading branch information
@aubymori
aubymori committed Apr 6, 2026
commit f87b5e32e53f5bf3608a244b064aaea27a1ee01a
5 changes: 4 additions & 1 deletion parse-options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,10 @@ static void check_typos(const char *arg, const struct option *options)
if (!options->long_name)
continue;
if (starts_with(options->long_name, arg)) {
error(_("did you mean `--%s` (with two dashes)?"), arg);
if (options->type == OPTION_SUBCOMMAND)
error(_("did you mean `%s` (with no dash)?"), arg);
else
error(_("did you mean `--%s` (with two dashes)?"), arg);
exit(129);
}
}
Expand Down
Loading