* git: Correct display of multiline commit messages in recentchanges.

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 5507874e14d6020dbf931662f2c87aabb8058e54..d4d2ec7a943b7c2fd6639dc25555947e3b5ad467 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -367,10 +367,8 @@ sub rcs_recentchanges ($) { #{{{
 
        my @rets;
        foreach my $ci (git_commit_info('HEAD', $num)) {
 
        my @rets;
        foreach my $ci (git_commit_info('HEAD', $num)) {

-               my $title = join("\n", @{$ci->{'comment'}});
-

                # Skip redundant commits.
                # Skip redundant commits.

-               next if ($title eq $dummy_commit_msg);
+               next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);

 
                my ($sha1, $when) = (
                        $ci->{'sha1'},
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},


@@ -392,7 +390,7 @@ sub rcs_recentchanges ($) { #{{{
                                diffurl => $diffurl,
                        };
                }
                                diffurl => $diffurl,
                        };
                }

-               push @messages, { line => $title };
+               push @messages, { line => $_ } foreach @{$ci->{'comment'}};

 
                my ($user, $type) = (q{}, "web");
 
 
                my ($user, $type) = (q{}, "web");
 

diff --git a/debian/changelog b/debian/changelog
index 50ab0d54d00679546d9949cf2ad3e44ed22870de..f3ea40d207767872c7073f01dc2e7088734cf3da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
   * map: Don't inline images.
   * brokenlinks: Don't list the same link multiple times. (%links might
     contain multiple copies of the same link)
   * map: Don't inline images.
   * brokenlinks: Don't list the same link multiple times. (%links might
     contain multiple copies of the same link)

+  * git: Correct display of multiline commit messages in recentchanges.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 66ff207793b41d754210d33bc62c5bb3f33bf758..94570c720345eb1cfc79efad1a5fc751fe1aab01 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-12-16 16:08-0500\n"
+"POT-Creation-Date: 2007-12-16 16:44-0500\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -127,12 +127,12 @@ msgstr ""
 msgid "creating new page %s"
 msgstr ""
 
 msgid "creating new page %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/brokenlinks.pm:37
+#: ../IkiWiki/Plugin/brokenlinks.pm:40

 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/brokenlinks.pm:44
+#: ../IkiWiki/Plugin/brokenlinks.pm:47

 msgid "There are no broken links!"
 msgstr ""
 
 msgid "There are no broken links!"
 msgstr ""