X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-remote.perl;h=d13e4c1fea93f0c345f6638bfd8a3715c73fa693;hb=694a577519a762d12b8a53e76b6f1dd3ccf25e7d;hp=79941e40fa66069169d41881ff5c6a433dc34ab5;hpb=2af89f12c666634e92cd79a6c1af6acc34104c34;p=git.git

diff --git a/git-remote.perl b/git-remote.perl
index 79941e40f..d13e4c1fe 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -244,7 +244,8 @@ sub show_remote {
 	print "* remote $name\n";
 	print "  URL: $info->{'URL'}\n";
 	for my $branchname (sort keys %$branch) {
-		next if ($branch->{$branchname}{'REMOTE'} ne $name);
+		next unless (defined $branch->{$branchname}{'REMOTE'} &&
+			     $branch->{$branchname}{'REMOTE'} eq $name);
 		my @merged = map {
 			s|^refs/heads/||;
 			$_;
@@ -322,7 +323,7 @@ sub rm_remote {
 	my ($name) = @_;
 	if (!exists $remote->{$name}) {
 		print STDERR "No such remote $name\n";
-		return;
+		return 1;
 	}
 
 	$git->command('config', '--remove-section', "remote.$name");
@@ -337,13 +338,13 @@ sub rm_remote {
 		}
 	};
 
-
 	my @refs = $git->command('for-each-ref',
 		'--format=%(refname) %(objectname)', "refs/remotes/$name");
 	for (@refs) {
 		($ref, $object) = split;
 		$git->command(qw(update-ref -d), $ref, $object);
 	}
+	return 0;
 }
 
 sub add_usage {
@@ -461,7 +462,7 @@ elsif ($ARGV[0] eq 'rm') {
 		print STDERR "Usage: git remote rm <remote>\n";
 		exit(1);
 	}
-	rm_remote($ARGV[1]);
+	exit(rm_remote($ARGV[1]));
 }
 else {
 	print STDERR "Usage: git remote\n";