X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=gitremotes;h=6c03011a8cb5ac73a90edb1e74dab102c55eb9d5;hp=7b9484dd16dc3c4f3a1ee36ab566dfd0aa8eb07b;hb=937b24e0cf98d75dd353d80267efddcecab9e908;hpb=8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a

diff --git a/gitremotes b/gitremotes
index 7b9484dd1..6c03011a8 100755
--- a/gitremotes
+++ b/gitremotes
@@ -1,12 +1,11 @@
 #!/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>) {
-	if (/^\*\s+\[?\[?(\w+)\]?\]?\s+`([^>]+)`/) {
+	if (/^\*\s+\[?\[?(\w+)(?:\|\w+)?\]?\]?\s+`([^>]+)`/) {
 		# note that the remote name has to be a simple word (\w)
 		# for security/sanity reasons
 		my $remote=$1;
@@ -17,13 +16,10 @@ 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", "-f", $remote, $url);
+			system("git", "config", "remote.$remote.tagopt",
+				"--no-tags");
 		}
 	}
 }
 close IN;
-
-exit $error;