Merge branch 'master' into commentreorg

master
Joey Hess 2010-05-07 13:25:56 -04:00
commit 911184432d
4 changed files with 26 additions and 2 deletions

View File

@ -2348,7 +2348,8 @@ sub match_internal ($$;@) {
sub match_page ($$;@) {
my $page=shift;
my $match=match_glob($page, shift, @_);
if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
if ($match && ! (exists $IkiWiki::pagesources{$page}
&& defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
return IkiWiki::FailReason->new("$page is not a page");
}
else {

View File

@ -2,6 +2,9 @@ Seen while deleting a blog's calendar pages:
--[[Joey]]
[[done]] -- the new `page()` pagespec needed to check if there was a source
file for the page, and was leaking undef.
<pre>
427250f..ff6c054 master -> origin/master
Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.

View File

@ -0,0 +1,18 @@
[[!tag patch]]
[[!template id=gitbranch branch=smcv/ready/no-tags author="[[smcv]]"]]
The `gitremotes` script picks up tags from any repository, including those
used for local .debs that were never actually present in Debian:
smcv@reptile% git tag | grep -c nmu
52
This can be avoided with the `tagopt = --no-tags` option in .git/config;
see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
> [[done]] thanks. Also cleared propigated tags out of origin.
>
> Hmm, in testing I still see tags get pulled the first time a remote
> is added. If those are then locally deleted, it doesn't pull them again
> with the `--no-tags`.
> --[[Joey]]

View File

@ -16,7 +16,9 @@ while (<IN>) {
my ($oldurl)=$info=~/URL: (.*)/m;
if ($oldurl ne $url) {
system("git remote rm $remote 2>/dev/null");
system("git", "remote", "add", "-f", $remote, $url)
system("git", "remote", "add", "-f", $remote, $url);
system("git", "config", "remote.$remote.tagopt",
"--no-tags");
}
}
}