X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a..79f3e32ea7adf3e5adbef0a8c9c68cd32a67cac4:/gitremotes

diff --git a/gitremotes b/gitremotes
index 7b9484dd1..e2468814b 100755
--- a/gitremotes
+++ b/gitremotes
@@ -6,7 +6,7 @@ my $error=0;
 
 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;
@@ -15,13 +15,19 @@ while (<IN>) {
 		# check configured url to deal with it changing
 		my $info=`git remote show -n $remote`;
 		my ($oldurl)=$info=~/URL: (.*)/m;
+		my $r;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			$error |= system("git", "remote", "add", "-f", $remote, $url);
+			$r = system("git", "remote", "add", "-f", $remote, $url)
 		}
 		else {
-			$error |= system("git", "fetch", $remote);
+			$r = system("git", "fetch", "--no-tag", $remote);
 		}
+
+		if ($r != 0) {
+			print "$remote failed\n";
+		}
+		$error |= $r;
 	}
 }
 close IN;