pack-objects: validation and documentation about unreachable options

diff --git a/parse-options.c b/parse-options.c
index 29f4defdd6f2a85604d429d0278e0997378077b2..125e84f98451b4eb12e9d8a6cb4da58b2d8db51e 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -459,6 +459,8 @@ static int show_gitcomp(struct parse_opt_ctx_t *ctx,
                default:
                        break;
                }
+               if (opts->flags & PARSE_OPT_COMP_ARG)
+                       suffix = "=";
                printf(" --%s%s", opts->long_name, suffix);
        }
        fputc('\n', stdout);
@@ -569,7 +571,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 
 int parse_options_end(struct parse_opt_ctx_t *ctx)
 {
-       memmove(ctx->out + ctx->cpidx, ctx->argv, ctx->argc * sizeof(*ctx->out));
+       MOVE_ARRAY(ctx->out + ctx->cpidx, ctx->argv, ctx->argc);
        ctx->out[ctx->cpidx + ctx->argc] = NULL;
        return ctx->cpidx + ctx->argc;
 }