From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Jun 2019 18:24:10 +0000 (-0700)
Subject: Merge branch 'md/list-objects-filter-parse-msgfix'
X-Git-Tag: v2.23.0-rc0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca02d3669f3db502efaa9cb5a41a825c532cbabe;p=thirdparty%2Fgit.git

Merge branch 'md/list-objects-filter-parse-msgfix'

Make an end-user facing message localizable.

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

ca02d3669f3db502efaa9cb5a41a825c532cbabe
diff --cc list-objects-filter-options.c
index a15d0f7829,d0a5362331..1cb20c659c
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@@ -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;