Re: [PATCH 1/8] am: handle "-h" argument earlier
From: Junio C Hamano <hidden>
Date: 2017-05-30 05:43:28
Jeff King [off-list ref] writes:
We can't easily move that setup to after the parse_options() call; the point is to set up defaults that are overwritten by the option parsing. Instead, we'll detect the "-h" case early and show the usage then. This matches the behavior of other builtins which have a similar setup-ordering issue (e.g., git-branch).
Thanks. And this structure of the series is very much appreciated.
quoted hunk
Signed-off-by: Jeff King <redacted> --- builtin/am.c | 3 +++ 1 file changed, 3 insertions(+)diff --git a/builtin/am.c b/builtin/am.c index 0f63dcab1..5ee146bfb 100644 --- a/builtin/am.c +++ b/builtin/am.c@@ -2311,6 +2311,9 @@ int cmd_am(int argc, const char **argv, const char *prefix) OPT_END() }; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(usage, options); + git_config(git_am_config, NULL); am_state_init(&state);