Merge branch 'jc/remote-multi-url'

* jc/remote-multi-url:
  git-remote: do not complain on multiple URLs for a remote
maint
Junio C Hamano 2008-03-02 15:11:19 -08:00
commit ca132089d2
1 changed files with 3 additions and 3 deletions

View File

@ -7,11 +7,11 @@ my $git = Git->repository();
sub add_remote_config { sub add_remote_config {
my ($hash, $name, $what, $value) = @_; my ($hash, $name, $what, $value) = @_;
if ($what eq 'url') { if ($what eq 'url') {
if (exists $hash->{$name}{'URL'}) { # Having more than one is Ok -- it is used for push.
print STDERR "Warning: more than one remote.$name.url\n"; if (! exists $hash->{'URL'}) {
}
$hash->{$name}{'URL'} = $value; $hash->{$name}{'URL'} = $value;
} }
}
elsif ($what eq 'fetch') { elsif ($what eq 'fetch') {
$hash->{$name}{'FETCH'} ||= []; $hash->{$name}{'FETCH'} ||= [];
push @{$hash->{$name}{'FETCH'}}, $value; push @{$hash->{$name}{'FETCH'}}, $value;