list-objects-filter-options: support --no-filter

Teach opt_parse_list_objects_filter() to take --no-filter
option and to free the contents of struct filter_options.
This command line argument will be automatically inherited
by commands using OPT_PARSE_LIST_OBJECTS_FILTER(); this
includes pack-objects.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index b924c6cbf7ab023c272554e540e9aacf29e293e9..aa403d02f33699cde77c507c0402d9dfa0b7fb2f 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -242,6 +242,9 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
        the resulting packfile.  See linkgit:git-rev-list[1] for valid
        `<filter-spec>` forms.
 
        the resulting packfile.  See linkgit:git-rev-list[1] for valid
        `<filter-spec>` forms.
 

+--no-filter::
+       Turns off any previous `--filter=` argument.
+

 --missing=<missing-action>::
        A debug option to help with future "partial clone" development.
        This option specifies how missing objects are handled.
 --missing=<missing-action>::
        A debug option to help with future "partial clone" development.
        This option specifies how missing objects are handled.

diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 52bdec75bf9a451a92291ae96adfa95d8d2f7bf8..4c5b34e9499433e12b55a34f425aace38d9ecfaa 100644 (file)
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -74,8 +74,19 @@ int opt_parse_list_objects_filter(const struct option *opt,
 {
        struct list_objects_filter_options *filter_options = opt->value;
 
 {
        struct list_objects_filter_options *filter_options = opt->value;
 

-       assert(arg);
-       assert(!unset);
+       if (unset || !arg) {
+               list_objects_filter_release(filter_options);
+               return 0;
+       }

 
        return parse_list_objects_filter(filter_options, arg);
 }
 
        return parse_list_objects_filter(filter_options, arg);
 }

+
+void list_objects_filter_release(
+       struct list_objects_filter_options *filter_options)
+{
+       free(filter_options->filter_spec);
+       free(filter_options->sparse_oid_value);
+       free(filter_options->sparse_path_value);
+       memset(filter_options, 0, sizeof(*filter_options));
+}

diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index dd7e5db2dbdbe580ffa6847b2c87a3ec03f2fdbd..eea44a1a51b7c41feba26a688f82f3c67b23667e 100644 (file)
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -52,7 +52,10 @@ int opt_parse_list_objects_filter(const struct option *opt,
 
 #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
        { OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \
 
 #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
        { OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \

-         N_("object filtering"), PARSE_OPT_NONEG, \
+         N_("object filtering"), 0, \

          opt_parse_list_objects_filter }
 
          opt_parse_list_objects_filter }
 

+void list_objects_filter_release(
+       struct list_objects_filter_options *filter_options);
+

 #endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
 #endif /* LIST_OBJECTS_FILTER_OPTIONS_H */