Merge branch 'jc/remote-multi-url'

* jc/remote-multi-url: git-remote: do not complain on multiple URLs for a remote
git-mirror · Mar 2, 2008 · ca13208 · ca13208
2 parents 4bea4b8 + 95775e5
commit ca13208
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/git-remote.perl b/git-remote.perl
@@ -7,10 +7,10 @@
 sub add_remote_config {
 	my ($hash, $name, $what, $value) = @_;
 	if ($what eq 'url') {
-		if (exists $hash->{$name}{'URL'}) {
-			print STDERR "Warning: more than one remote.$name.url\n";
+		# Having more than one is Ok -- it is used for push.
+		if (! exists $hash->{'URL'}) {
+			$hash->{$name}{'URL'} = $value;
 		}
-		$hash->{$name}{'URL'} = $value;
 	}
 	elsif ($what eq 'fetch') {
 		$hash->{$name}{'FETCH'} ||= [];