list-objects-filter: remove CL_ARG__FILTER

derrickstolee · gitster · commit cc910442560e · 2022-03-23T13:13:17.000-07:00
We have established the command-line interface for the --[no-]filter
options for a while now, so we do not need a helper to make this
editable in the future.

Signed-off-by: Derrick Stolee &lt;derrickstolee@github.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
@@ -153,11 +153,11 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 			args.from_promisor = 1;
 			continue;
 		}
-		if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
+		if (skip_prefix(arg, ("--filter="), &arg)) {
 			parse_list_objects_filter(&args.filter_options, arg);
 			continue;
 		}
-		if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
+		if (!strcmp(arg, ("--no-filter"))) {
 			list_objects_filter_set_no_filter(&args.filter_options);
 			continue;
 		}
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
@@ -69,9 +69,6 @@ struct list_objects_filter_options {
 	 */
 };
 
-/* Normalized command line arguments */
-#define CL_ARG__FILTER "filter"
-
 /*
  * Parse value of the argument to the "filter" keyword.
  * On the command line this looks like:
@@ -111,7 +108,7 @@ int opt_parse_list_objects_filter(const struct option *opt,
 				  const char *arg, int unset);
 
 #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
-	OPT_CALLBACK(0, CL_ARG__FILTER, fo, N_("args"), \
+	OPT_CALLBACK(0, "filter", fo, N_("args"), \
 	  N_("object filtering"), \
 	  opt_parse_list_objects_filter)
 
diff --git a/revision.c b/revision.c
@@ -2691,9 +2691,9 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
 		revs->no_walk = 0;
 	} else if (!strcmp(arg, "--single-worktree")) {
 		revs->single_worktree = 1;
-	} else if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
+	} else if (skip_prefix(arg, ("--filter="), &arg)) {
 		parse_list_objects_filter(&revs->filter, arg);
-	} else if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
+	} else if (!strcmp(arg, ("--no-filter"))) {
 		list_objects_filter_set_no_filter(&revs->filter);
 	} else {
 		return 0;

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,11 @@ int cmd_fetch_pack(int argc, const char *argv, const char prefix)`
`153`	`153`	`args.from_promisor = 1;`
`154`	`154`	`continue;`
`155`	`155`	`}`
`156`		`- if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {`
	`156`	`+ if (skip_prefix(arg, ("--filter="), &arg)) {`
`157`	`157`	`parse_list_objects_filter(&args.filter_options, arg);`
`158`	`158`	`continue;`
`159`	`159`	`}`
`160`		`- if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {`
	`160`	`+ if (!strcmp(arg, ("--no-filter"))) {`
`161`	`161`	`list_objects_filter_set_no_filter(&args.filter_options);`
`162`	`162`	`continue;`
`163`	`163`	`}`