Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'

[git.ikiwiki.info.git] / IkiWiki / Plugin / autoindex.pm

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index dede9eb05cf3fafc9e4cc8e4d9ad013a088417a5..d5ee4b58f3422344a3debae53dd334366ad43e18 100644 (file)
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -33,9 +33,6 @@ sub checkconfig () {
        if (! defined $config{autoindex_commit}) {
                $config{autoindex_commit} = 1;
        }
-       if (! $config{autoindex_commit}) {
-               $config{only_committed_changes}=0;
-       }
 }
 
 sub genindex ($) {
@@ -74,7 +71,6 @@ sub refresh () {
 
        my (%pages, %dirs);
        foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
-               next if $dir eq $IkiWiki::Plugin::transient::transientdir;
                chdir($dir) || next;
 
                find({
@@ -93,7 +89,7 @@ sub refresh () {
                                        if (! -d _) {
                                                $pages{pagename($f)}=1;
                                        }
-                                       elsif ($dir eq $config{srcdir}) {
+                                       elsif ($dir eq $config{srcdir} || ! $config{autoindex_commit}) {
                                                $dirs{$f}=1;
                                        }
                                }