summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-05 20:54:10 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-05 20:54:10 +0000
commit89697f2c7a9cebc9e0c33ca1d056388b9e827eb8 (patch)
tree35adc82dcc36e1a094abc2cfd495d572bb695d7e
parent56378a14e2c41902d8d97bf51d26446e42a83ab3 (diff)
* Patch from Recai to fix utf8 issues in git backend.
-rw-r--r--IkiWiki/Rcs/git.pm4
-rw-r--r--debian/changelog3
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 636eb57f5..6cbcfd14e 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -3,6 +3,8 @@
use warnings;
use strict;
use IkiWiki;
+use Encode;
+use open qw{:utf8 :std};
package IkiWiki;
@@ -228,7 +230,7 @@ sub _parse_diff_tree (@) { #{{{
}
if (length $file) {
push @{ $ci{'details'} }, {
- 'file' => $file,
+ 'file' => decode_utf8($file),
'sha1_from' => $sha1_from,
'sha1_to' => $sha1_to,
};
diff --git a/debian/changelog b/debian/changelog
index 4d1cea8a9..6b7c1a679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ikiwiki (1.9) UNRELEASED; urgency=low
* Improve display of parentlinks and page title of toplevel index page.
* Patch from Faidon to use svn --limit when possible for recentchanges,
speeds up recentchanges a lot for wikis with more history.
+ * Patch from Recai to fix utf8 issues in git backend.
- -- Joey Hess <joeyh@debian.org> Wed, 5 Jul 2006 13:33:59 -0400
+ -- Joey Hess <joeyh@debian.org> Wed, 5 Jul 2006 16:53:34 -0400
ikiwiki (1.8) unstable; urgency=low