* Make pagespec merge code smarter about merging duplicate pagespecs.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b9ae74f854dab240c5e563be920d9947bad48f23..5ebec5d0b1cf94d1b7a030f3336d0335029db421 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,6 +544,8 @@ sub pagespec_merge ($$) { #{{{
        my $a=shift;
        my $b=shift;
 
+       return $a if $a eq $b;
+
         # Support for old-style GlobLists.
         if (is_globlist($a)) {
                 $a=globlist_to_pagespec($a);

diff --git a/debian/changelog b/debian/changelog
index 73a1dc18e6ce72eafb6b8771a159f5031b15cb96..4f7342cde4a1c7dbce34a79c33f91117b741b81a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ ikiwiki (1.22) UNRELEASED; urgency=low
   * Add a template plugin.
   * Use the template plugin to add infoboxes to each plugin page listing basic
     info about the plugin.
+  * Make pagespec merge code smarter about merging duplicate pagespecs.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 22 Aug 2006 23:09:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Aug 2006 02:38:34 -0400
 
 ikiwiki (1.21) unstable; urgency=low