From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:13 +0000 (-0700)
Subject: Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maint
X-Git-Tag: v2.23.0-rc0~1^2~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0a2e8387e9f4842f134cfdde7a28eee61daec971?hp=-c

Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maint

Test update.

* sg/t5551-fetch-smart-error-is-translated:
t5551: use 'test_i18ngrep' to check translated output
---

0a2e8387e9f4842f134cfdde7a28eee61daec971
diff --combined t/t5551-http-fetch-smart.sh
index aed2d9bb05,cb11f13d6d..e38e543867
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@@ -199,7 -199,7 +199,7 @@@ test_expect_success 'GIT_SMART_HTTP ca
  
  test_expect_success 'invalid Content-Type rejected' '
  	test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual &&
- 	grep "not valid:" actual
+ 	test_i18ngrep "not valid:" actual
  '
  
  test_expect_success 'create namespaced refs' '
@@@ -301,10 -301,11 +301,10 @@@ test_expect_success CMDLINE_LIMIT 
  	)
  '
  
 -test_expect_success 'large fetch-pack requests can be split across POSTs' '
 +test_expect_success 'large fetch-pack requests can be sent using chunked encoding' '
  	GIT_TRACE_CURL=true git -c http.postbuffer=65536 \
  		clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
 -	grep "^=> Send header: POST" err >posts &&
 -	test_line_count = 2 posts
 +	grep "^=> Send header: Transfer-Encoding: chunked" err
  '
  
  test_expect_success 'test allowreachablesha1inwant' '
@@@ -465,7 -466,7 +465,7 @@@ test_expect_success 'GIT_TRACE_CURL_NO_
  
  test_expect_success 'server-side error detected' '
  	test_must_fail git clone $HTTPD_URL/error_smart/repo.git 2>actual &&
- 	grep "server-side error" actual
+ 	test_i18ngrep "server-side error" actual
  '
  
  test_done