X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=gitremotes;h=5cafad1b8dcb550c694567b7815978a7861fc6fe;hp=91bf2fe84fb4580c1b479076a774066f09b20870;hb=cf8a46b761ab4131fa08aade85b840bbfd4d2ba1;hpb=86edd73d169600875a10a635ef8df4a644545b0d

diff --git a/gitremotes b/gitremotes
index 91bf2fe84..5cafad1b8 100755
--- a/gitremotes
+++ b/gitremotes
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Parses list of remotes in doc/git.mdwn, configures git to use them
-# all, and fetches updates from them.
-
-my $error=0;
+# all. After running this, use "git remote update --prune" to pull
+# updates from all remotes.
 
 open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!";
 while (<IN>) {
@@ -17,13 +16,11 @@ while (<IN>) {
 		my ($oldurl)=$info=~/URL: (.*)/m;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			$error |= system("git", "remote", "add", "-f", $remote, $url);
-		}
-		else {
-			$error |= system("git", "fetch", $remote);
+			system("git", "remote", "add", $remote, $url);
+			system("git", "config", "remote.$remote.tagopt",
+				"--no-tags");
+			system("git", "fetch", $remote);
 		}
 	}
 }
 close IN;
-
-exit $error;