* Support git authors of the form "joey <joey>", which is common when

   importing from a svn repo.

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 38581ba679040081aa4d7b6f430c5784e04e8aa4..3407354c9a28a5e9ccbe4f313ade0f4dd40ed6b2 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -180,7 +180,7 @@ sub _parse_diff_tree ($@) { #{{{
                        $ci{ "${who}_epoch" } = $epoch;
                        $ci{ "${who}_tz"    } = $tz;
 
-                       if ($name =~ m/^([^<]+) <([^@]+)/) {
+                       if ($name =~ m/^([^<]+) <([^@>]+)/) {
                                my ($fullname, $username) = ($1, $2);
                                $ci{"${who}_fullname"}    = $fullname;
                                $ci{"${who}_username"}    = $username;

diff --git a/debian/changelog b/debian/changelog
index 225177f479cf8d73926f227a7bce5507ad7a175b..eef365b83e47f4a246820f6b82a6f2b0dec05f22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.10) UNRELEASED; urgency=low
+ikiwiki (2.10) unstable; urgency=low
 
   * Tidy ctime debug output for git.
   * French translation update. Closes: #445923
@@ -22,8 +22,10 @@ ikiwiki (2.10) UNRELEASED; urgency=low
     had to fork python for every rst page render. Note that if you use
     the rst plugin, you now need to have the RPC::XML perl module installed.
   * Danish translation from Jonas Smedegaard. Closes: #446952
+  * Support git authors of the form "joey <joey>", which is common when
+    importing from a svn repo.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 16 Oct 2007 17:53:52 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 20 Oct 2007 19:42:46 -0400
 
 ikiwiki (2.9) unstable; urgency=low