diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-15 13:00:25 +0900 |
| commit | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (patch) | |
| tree | d5e62fb29ab9d5a80a8d391dbc5b39971dfcce51 /parse-options.c | |
| parent | 85c26ae4bb73eaf46163e8ff48e85c81e52a6eec (diff) | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
Sync with Git 2.20.1
* maint:
Git 2.20.1
.gitattributes: ensure t/oid-info/* has eol=lf
t9902: 'send-email' test case requires PERL
t4256: mark support files as LF-only
parse-options: fix SunCC compiler warning
help -a: handle aliases with long names gracefully
help.h: fix coding style
run-command: report exec failure
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index 3b874a83a0..6932eaff61 100644 --- a/parse-options.c +++ b/parse-options.c @@ -516,7 +516,7 @@ static int show_gitcomp(struct parse_opt_ctx_t *ctx, show_negated_gitcomp(original_opts, -1); show_negated_gitcomp(original_opts, nr_noopts); fputc('\n', stdout); - exit(0); + return PARSE_OPT_COMPLETE; } static int usage_with_options_internal(struct parse_opt_ctx_t *, @@ -638,6 +638,8 @@ int parse_options(int argc, const char **argv, const char *prefix, case PARSE_OPT_HELP: case PARSE_OPT_ERROR: exit(129); + case PARSE_OPT_COMPLETE: + exit(0); case PARSE_OPT_NON_OPTION: case PARSE_OPT_DONE: break; |