From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:33:58 +0000 (-0800)
Subject: Merge branch 'as/ll-i18n'
X-Git-Tag: v2.17.0-rc0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4053966ea71a9f6460419fd68db912bda91ff85;p=thirdparty%2Fgit.git

Merge branch 'as/ll-i18n'

Some messages in low level start-up codepath have been i18n-ized.

* as/ll-i18n:
  Mark messages for translations
---

d4053966ea71a9f6460419fd68db912bda91ff85
diff --cc t/t0002-gitfile.sh
index fb8d094117,797dcf95b7..3691023d51
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@@ -17,14 -26,30 +17,14 @@@ test_expect_success 'initial setup' 
  
  test_expect_success 'bad setup: invalid .git file format' '
  	echo "gitdir $REAL" >.git &&
 -	if git rev-parse 2>.err
 -	then
 -		echo "git rev-parse accepted an invalid .git file"
 -		false
 -	fi &&
 -	if ! test_i18ngrep "invalid gitfile format" .err
 -	then
 -		echo "git rev-parse returned wrong error"
 -		false
 -	fi
 +	test_must_fail git rev-parse 2>.err &&
- 	grep "Invalid gitfile format" .err
++	test_i18ngrep "invalid gitfile format" .err
  '
  
  test_expect_success 'bad setup: invalid .git file path' '
  	echo "gitdir: $REAL.not" >.git &&
 -	if git rev-parse 2>.err
 -	then
 -		echo "git rev-parse accepted an invalid .git file path"
 -		false
 -	fi &&
 -	if ! test_i18ngrep "not a git repository" .err
 -	then
 -		echo "git rev-parse returned wrong error"
 -		false
 -	fi
 +	test_must_fail git rev-parse 2>.err &&
- 	grep "Not a git repository" .err
++	test_i18ngrep "not a git repository" .err
  '
  
  test_expect_success 'final setup + check rev-parse --git-dir' '