diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:15 +0900 |
| commit | f72e075e300cd4fb74adf61d574fd2125c37e2eb (patch) | |
| tree | 381df80a5887425bf99bfefad2dade17908a9fa5 | |
| parent | d0506fc419f61266e49077b7bed255d7691c0919 (diff) | |
| parent | f3a2fffe06d13b216cbc18acba5a46b8a00ae326 (diff) | |
| download | git-f72e075e300cd4fb74adf61d574fd2125c37e2eb.tar.gz | |
Merge branch 'jk/unbreak-am-h' into maint
"git am -h" triggered a BUG().
* jk/unbreak-am-h:
am: handle "-h" argument earlier
| -rw-r--r-- | builtin/am.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index e39142e4d2..593c1b5dda 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); |