Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix tests under GETTEXT_POISON on diffstat

Use the i18n-specific test functions in test scripts for diffstat.
This issue was was introduced in v1.7.9-1-g7f814:

    7f814 Use correct grammar in diffstat summary line

and been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit b354f11b595bb2bca4bae96b06778b3a9882b621 1 parent 2878568
Jiang Xin authored August 27, 2012 gitster committed August 27, 2012
8  t/t4006-diff-mode.sh
@@ -36,24 +36,24 @@ test_expect_success '--stat output after text chmod' '
36 36
 	test_chmod -x rezrov &&
37 37
 	echo " 0 files changed" >expect &&
38 38
 	git diff HEAD --stat >actual &&
39  
-	test_cmp expect actual
  39
+	test_i18ncmp expect actual
40 40
 '
41 41
 
42 42
 test_expect_success '--shortstat output after text chmod' '
43 43
 	git diff HEAD --shortstat >actual &&
44  
-	test_cmp expect actual
  44
+	test_i18ncmp expect actual
45 45
 '
46 46
 
47 47
 test_expect_success '--stat output after binary chmod' '
48 48
 	test_chmod +x binbin &&
49 49
 	echo " 0 files changed" >expect &&
50 50
 	git diff HEAD --stat >actual &&
51  
-	test_cmp expect actual
  51
+	test_i18ncmp expect actual
52 52
 '
53 53
 
54 54
 test_expect_success '--shortstat output after binary chmod' '
55 55
 	git diff HEAD --shortstat >actual &&
56  
-	test_cmp expect actual
  56
+	test_i18ncmp expect actual
57 57
 '
58 58
 
59 59
 test_done
2  t/t4202-log.sh
@@ -803,7 +803,7 @@ sanitize_output () {
803 803
 test_expect_success 'log --graph with diff and stats' '
804 804
 	git log --graph --pretty=short --stat -p >actual &&
805 805
 	sanitize_output >actual.sanitized <actual &&
806  
-	test_cmp expect actual.sanitized
  806
+	test_i18ncmp expect actual.sanitized
807 807
 '
808 808
 
809 809
 test_done
4  t/t4205-log-pretty-formats.sh
@@ -88,7 +88,7 @@ test_expect_success 'NUL separation with --stat' '
88 88
 	stat1_part=$(git diff --stat --root HEAD^) &&
89 89
 	printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
90 90
 	git log -z --stat --pretty="format:%s" >actual &&
91  
-	test_cmp expected actual
  91
+	test_i18ncmp expected actual
92 92
 '
93 93
 
94 94
 test_expect_failure 'NUL termination with --stat' '
@@ -96,7 +96,7 @@ test_expect_failure 'NUL termination with --stat' '
96 96
 	stat1_part=$(git diff --stat --root HEAD^) &&
97 97
 	printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
98 98
 	git log -z --stat --pretty="tformat:%s" >actual &&
99  
-	test_cmp expected actual
  99
+	test_i18ncmp expected actual
100 100
 '
101 101
 
102 102
 test_done
2  t/t7508-status.sh
@@ -80,7 +80,7 @@ test_expect_success 'status --column' '
80 80
 #	dir1/untracked dir2/untracked untracked
81 81
 #	dir2/modified  output
82 82
 EOF
83  
-	test_cmp expect output
  83
+	test_i18ncmp expect output
84 84
 '
85 85
 
86 86
 cat >expect <<\EOF

0 notes on commit b354f11

Please sign in to comment.
Something went wrong with that request. Please try again.