Merge branch 'bg/maint-gitweb-test-lib'

gitster · gitster · commit 016c4b8919a0 · 2010-11-17T15:01:37.000-08:00
* bg/maint-gitweb-test-lib:
  t/gitweb-lib: Don't pass constant to decode_utf8

Conflicts:
	t/gitweb-lib.sh
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
@@ -97,7 +97,7 @@ if ! test_have_prereq PERL; then
 	test_done
 fi
 
-perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
+perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || {
 	skip_all='skipping gitweb tests, perl version is too old'
 	test_done
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ if ! test_have_prereq PERL; then`
`97`	`97`	`test_done`
`98`	`98`	`fi`
`99`	`99`
`100`		`-perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {`
	`100`	`+perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {`
`101`	`101`	`skip_all='skipping gitweb tests, perl version is too old'`
`102`	`102`	`test_done`
`103`	`103`	`}`