list-objects-filter: remove CL_ARG__FILTER

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 <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index c2d96f4c89ab0fa7207f74a17d0bdf94f8bd3780..c4b9104f9b58edfcc8064d29d5b77641020c671a 100644 (file)
--- 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
index 2eb6c983949db0354b0041f10c36e24dc2885116..90e4bc9625280dc30e8fd0c390004aba185a9d53 100644 (file)
--- 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
index 2646b78990ea4dc56dfdefef65f48b17ca4c894a..7d435f80480ef1b7684fdc43b51057d20e79966f 100644 (file)
--- 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;