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 /builtin | |
| parent | Prepare for 2.21 cycle to start soonish (diff) | |
| parent | Git 2.20.1 (diff) | |
| download | tgif-b21ebb671bb7dea8d342225f0d66c41f4e54d5ca.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 | ||||
| -rw-r--r-- | builtin/shortlog.c | 2 | ||||
| -rw-r--r-- | builtin/update-index.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 06a7163ffe..6d798f9939 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -850,6 +850,8 @@ int cmd_blame(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_DONE: if (ctx.argv[0]) dashdash_pos = ctx.cpidx; diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 88f88e97b2..65cd41392c 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -287,6 +287,8 @@ int cmd_shortlog(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_DONE: goto parse_done; } diff --git a/builtin/update-index.c b/builtin/update-index.c index 31e7cce301..e19da77edc 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1086,6 +1086,8 @@ int cmd_update_index(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: { |