diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:45 -0700 |
| commit | 50ad8561dee9d479e41586689486cbbb4a742f7b (patch) | |
| tree | 41687648bc7b1674a109fdeb490b9b749f458fde /builtin/submodule--helper.c | |
| parent | 06959fe0e1f50608ff872be386a7c53d97f885f4 (diff) | |
| parent | d691551192ac845747694258ccae9ffeeb6bdd58 (diff) | |
| download | git-50ad8561dee9d479e41586689486cbbb4a742f7b.tar.gz | |
Merge branch 'jk/consistent-h'
"git $cmd -h" for builtin commands calls the implementation of the
command (i.e. cmd_$cmd() function) without doing any repository
set-up, and the commands that expect RUN_SETUP is done by the Git
potty needs to be prepared to show the help text without barfing.
* jk/consistent-h:
t0012: test "-h" with builtins
git: add hidden --list-builtins option
version: convert to parse-options
diff- and log- family: handle "git cmd -h" early
submodule--helper: show usage for "-h"
remote-{ext,fd}: print usage message on invalid arguments
upload-archive: handle "-h" option early
credential: handle invalid arguments earlier
Diffstat (limited to 'builtin/submodule--helper.c')
| -rw-r--r-- | builtin/submodule--helper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 8cc648d85b..1b4d2b3467 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1221,9 +1221,8 @@ static struct cmd_struct commands[] = { int cmd_submodule__helper(int argc, const char **argv, const char *prefix) { int i; - if (argc < 2) - die(_("submodule--helper subcommand must be " - "called with a subcommand")); + if (argc < 2 || !strcmp(argv[1], "-h")) + usage("git submodule--helper <command>"); for (i = 0; i < ARRAY_SIZE(commands); i++) { if (!strcmp(argv[1], commands[i].cmd)) { |