Re: [PATCH v4 04/10] list-objects-filter: implement composite filters

[Johannes Schindelin]

Hi Matthew,

On Fri, 14 Jun 2019, Matthew DeVore wrote:

> diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
> index 8e7b4f96fa..1c402c6059 100644
> --- a/list-objects-filter-options.c
> +++ b/list-objects-filter-options.c
> [...]
> +
> +static int parse_combine_filter(
> +     struct list_objects_filter_options *filter_options,
> +     const char *arg,
> +     struct strbuf *errbuf)
> +{
> +     struct strbuf **subspecs = strbuf_split_str(arg, '+', 0);
> +     size_t sub;
> +     int result = 0;
> +
> +     if (!subspecs[0]) {
> +             strbuf_addf(errbuf,
> +                         _("expected something after combine:"));

Please squash this in, to pacify Coccinelle:

-- snipsnap --
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 5e5e30bc6a17..483ab512e24c 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -150,7 +150,7 @@ static int parse_combine_filter(
        int result = 0;

        if (!subspecs[0]) {
-               strbuf_addf(errbuf,
+               strbuf_addstr(errbuf,
                            _("expected something after combine:"));
                result = 1;
                goto cleanup;