Merge branch 'js/visual-studio'

diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index bb33303f9b708435e5ca299ffeadaead54375549..b63c5ee1a368aa4d34cda8bbc41fce905692495b 100644 (file)
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -63,7 +63,18 @@ struct list_objects_filter_options {
 /* Normalized command line arguments */
 #define CL_ARG__FILTER "filter"
 
-int parse_list_objects_filter(
+void list_objects_filter_die_if_populated(
+       struct list_objects_filter_options *filter_options);
+
+/*
+ * Parses the filter spec string given by arg and either (1) simply places the
+ * result in filter_options if it is not yet populated or (2) combines it with
+ * the filter already in filter_options if it is already populated. In the case
+ * of (2), the filter specs are combined as if specified with 'combine:'.
+ *
+ * Dies and prints a user-facing message if an error occurs.
+ */
+void parse_list_objects_filter(
        struct list_objects_filter_options *filter_options,
        const char *arg);
 
@@ -109,6 +120,7 @@ void partial_clone_register(
        const char *remote,
        struct list_objects_filter_options *filter_options);
 void partial_clone_get_default_filter_spec(
-       struct list_objects_filter_options *filter_options);
+       struct list_objects_filter_options *filter_options,
+       const char *remote);
 
 #endif /* LIST_OBJECTS_FILTER_OPTIONS_H */