Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm

1 files changed, 4 insertions, 1 deletions

diff --git a/gitremotes b/gitremotes
index f596c650f..5cafad1b8 100755
--- a/gitremotes
+++ b/gitremotes
@@ -16,7 +16,10 @@ 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", $remote, $url);
+			system("git", "config", "remote.$remote.tagopt",
+				"--no-tags");
+			system("git", "fetch", $remote);
 		}
 	}
 }