Merge pull request #1977 from derrickstolee/test-oid-fix-windows

dscho · web-flow · commit 81269053d9c4 · 2018-12-13T20:13:18.000+01:00
.gitattributes: ensure t/oid-info/* has eol=lf
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,4 @@
 /Documentation/gitk.txt conflict-marker-size=32
 /Documentation/user-manual.txt conflict-marker-size=32
 /t/t????-*.sh conflict-marker-size=32
+/t/oid-info/* eol=lf
diff --git a/t/.gitattributes b/t/.gitattributes
@@ -16,6 +16,7 @@ t[0-9][0-9][0-9][0-9]/* -whitespace
 /t4135/* eol=lf
 /t4211/* eol=lf
 /t4252/* eol=lf
+/t4256/1/* eol=lf
 /t5100/* eol=lf
 /t5515/* eol=lf
 /t556x_common eol=lf
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
@@ -1534,7 +1534,7 @@ test_expect_success 'complete tree filename with metacharacters' '
 	EOF
 '
 
-test_expect_success 'send-email' '
+test_expect_success PERL 'send-email' '
 	test_completion "git send-email --cov" "--cover-letter " &&
 	test_completion "git send-email ma" "master "
 '

Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,7 @@ test_expect_success 'complete tree filename with metacharacters' '`
`1534`	`1534`	`EOF`
`1535`	`1535`	`'`
`1536`	`1536`
`1537`		`-test_expect_success 'send-email' '`
	`1537`	`+test_expect_success PERL 'send-email' '`
`1538`	`1538`	`test_completion "git send-email --cov" "--cover-letter " &&`
`1539`	`1539`	`test_completion "git send-email ma" "master "`
`1540`	`1540`	`'`