projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
53b1708
598df7b
)
Merge branch 'bg/maint-gitweb-test-lib'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 17 Nov 2010 23:01:37 +0000
(15:01 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 17 Nov 2010 23:01:37 +0000
(15:01 -0800)
* bg/maint-gitweb-test-lib:
t/gitweb-lib: Don't pass constant to decode_utf8
Conflicts:
t/gitweb-lib.sh
1
2
t/gitweb-lib.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
t/gitweb-lib.sh
index 8b5b987f45853da5d24148acc398b838ada7e616,1b9523d02f3a8e785b0823a1d58dfaa22837ba39..b9bb95feaa5088254b002c2806c2c2ae9e9d7be4
---
1
/
t/gitweb-lib.sh
---
2
/
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