From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 23:01:37 +0000 (-0800)
Subject: Merge branch 'bg/maint-gitweb-test-lib'
X-Git-Tag: v1.7.4-rc0~131
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=016c4b8919a0a58a430f3483aeac35de9dfdc579;p=git.git

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

* bg/maint-gitweb-test-lib:
  t/gitweb-lib: Don't pass constant to decode_utf8

Conflicts:
	t/gitweb-lib.sh
---

016c4b8919a0a58a430f3483aeac35de9dfdc579
diff --cc t/gitweb-lib.sh
index 8b5b987f4,1b9523d02..b9bb95fea
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@@ -97,9 -80,9 +97,9 @@@ if ! test_have_prereq PERL; the
  	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
 +	skip_all='skipping gitweb tests, perl version is too old'
 +	test_done
  }
  
  gitweb_init