parse-options: drop unused ctx parameter from show_gitcomp()

peff · gitster · commit 5205749d2ca8 · 2019-03-20T18:34:09.000+09:00
The completion display doesn't actually care about where we are in the
parsing. It's generated completely from the set of available options. So
we don't need to see the parse-options context struct at all.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/parse-options.c b/parse-options.c
@@ -523,8 +523,7 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
 	}
 }
 
-static int show_gitcomp(struct parse_opt_ctx_t *ctx,
-			const struct option *opts)
+static int show_gitcomp(const struct option *opts)
 {
 	const struct option *original_opts = opts;
 	int nr_noopts = 0;
@@ -603,7 +602,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 
 		/* lone --git-completion-helper is asked by git-completion.bash */
 		if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))
-			return show_gitcomp(ctx, options);
+			return show_gitcomp(options);
 
 		if (arg[1] != '-') {
 			ctx->opt = arg + 1;

Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,7 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`
`526`		`-static int show_gitcomp(struct parse_opt_ctx_t *ctx,`
`527`		`- const struct option *opts)`
	`526`	`+static int show_gitcomp(const struct option *opts)`
`528`	`527`	`{`
`529`	`528`	`const struct option *original_opts = opts;`
`530`	`529`	`int nr_noopts = 0;`
`@@ -603,7 +602,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,`
`603`	`602`
`604`	`603`	`/* lone --git-completion-helper is asked by git-completion.bash */`
`605`	`604`	`if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))`
`606`		`- return show_gitcomp(ctx, options);`
	`605`	`+ return show_gitcomp(options);`
`607`	`606`
`608`	`607`	`if (arg[1] != '-') {`
`609`	`608`	`ctx->opt = arg + 1;`