Merge branch 'master' of git://github.com/joeyh/ikiwiki

1 files changed, 8 insertions, 2 deletions

diff --git a/gitremotes b/gitremotes
index 91bf2fe84..e2468814b 100755
--- a/gitremotes
+++ b/gitremotes
@@ -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;