summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-12-11 16:35:01 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-12 17:21:33 +0900
commita92ec7efe0ad25f1c2047230c0324dcb54ce1cfc (patch)
tree0089c72cfbdf54da76582fc210048badce72071e /builtin
parentMerge branch 'nd/completion-negation' (diff)
downloadtgif-a92ec7efe0ad25f1c2047230c0324dcb54ce1cfc.tar.xz
parse-options: fix SunCC compiler warning
The compiler reports this because show_gitcomp() never actually returns a value: "parse-options.c", line 520: warning: Function has no return statement : show_gitcomp We could shut the compiler up. But instead let's not bury exit() too deep. Do the same as internal -h handling, return a special error code and handle the exit() in parse_options() (and other parse_options_step() callers) instead. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/shortlog.c2
-rw-r--r--builtin/update-index.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 5a0388aaef..7e880392a6 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -844,6 +844,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 608d6ba77b..e9c12bd392 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -286,6 +286,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 a8709a26ec..9d41ba0ad4 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1071,6 +1071,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:
{