From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 23 Aug 2006 06:44:47 +0000 (+0000)
Subject: * Make pagespec merge code smarter about merging duplicate pagespecs.
X-Git-Tag: 1.22~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9dbcd29e5fc244845434a7ccbf96067831315bb;p=ikiwiki.git

* Make pagespec merge code smarter about merging duplicate pagespecs.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b9ae74f85..5ebec5d0b 100644
--- 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 73a1dc18e..4f7342cde 100644
--- 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