From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:06 +0000 (-0700)
Subject: Merge branch 'bg/maint-gitweb-test-lib' into next
X-Git-Tag: ko-next~178
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ead869fcba8214e0863cccfe85c3f87d6f26f1c;p=git.git

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

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

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

0ead869fcba8214e0863cccfe85c3f87d6f26f1c
diff --cc t/gitweb-lib.sh
index 8c490c870,1b9523d02..3151adb9c
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@@ -80,9 -80,9 +80,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