]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'md/list-objects-filter-parse-msgfix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:10 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:10 +0000 (11:24 -0700)
Make an end-user facing message localizable.

* md/list-objects-filter-parse-msgfix:
  list-objects-filter-options: error is localizeable

1  2 
list-objects-filter-options.c

index a15d0f782923f6bbb0aa9534c80f53c2942e7a79,d0a5362331991fa73e9a24aef9348d500a591368..1cb20c659c82b151a652da0528d0673ac629cc6c
@@@ -78,20 -78,13 +78,20 @@@ static int gently_parse_list_objects_fi
                return 0;
  
        } else if (skip_prefix(arg, "sparse:path=", &v0)) {
 -              filter_options->choice = LOFC_SPARSE_PATH;
 -              filter_options->sparse_path_value = strdup(v0);
 -              return 0;
 +              if (errbuf) {
 +                      strbuf_addstr(
 +                              errbuf,
 +                              _("sparse:path filters support has been dropped"));
 +              }
 +              return 1;
        }
 +      /*
 +       * Please update _git_fetch() in git-completion.bash when you
 +       * add new filters
 +       */
  
        if (errbuf)
-               strbuf_addf(errbuf, "invalid filter-spec '%s'", arg);
+               strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);
  
        memset(filter_options, 0, sizeof(*filter_options));
        return 1;