diff options
| author | Joey Hess <joey@kitenet.net> | 2007-12-16 16:52:39 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2007-12-16 16:52:39 -0500 |
| commit | 58f1ef0784117a6b522c8ac64ec24056e1bbad8f (patch) | |
| tree | 9a3aca7299dc8fc739740543fa07a6c4d16f3194 | |
| parent | c3fed25ad4d301a8e901cf46ba9d11dbf6866d03 (diff) | |
| download | ikiwiki-58f1ef0784117a6b522c8ac64ec24056e1bbad8f.tar ikiwiki-58f1ef0784117a6b522c8ac64ec24056e1bbad8f.tar.gz | |
* git: Correct display of multiline commit messages in recentchanges.
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 5507874e1..d4d2ec7a9 100644 --- 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 $title = join("\n", @{$ci->{'comment'}}); - # Skip redundant commits. - next if ($title eq $dummy_commit_msg); + next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg); my ($sha1, $when) = ( $ci->{'sha1'}, @@ -392,7 +390,7 @@ sub rcs_recentchanges ($) { #{{{ diffurl => $diffurl, }; } - push @messages, { line => $title }; + push @messages, { line => $_ } foreach @{$ci->{'comment'}}; my ($user, $type) = (q{}, "web"); diff --git a/debian/changelog b/debian/changelog index 50ab0d54d..f3ea40d20 100644 --- 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) + * git: Correct display of multiline commit messages in recentchanges. -- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 66ff20779..94570c720 100644 --- 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" -"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" @@ -127,12 +127,12 @@ msgstr "" msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:37 +#: ../IkiWiki/Plugin/brokenlinks.pm:40 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:44 +#: ../IkiWiki/Plugin/brokenlinks.pm:47 msgid "There are no broken links!" msgstr "" |