From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 30 Sep 2007 06:34:19 +0000 (-0700)
Subject: git-remote: exit with non-zero status after detecting error in "rm".
X-Git-Tag: v1.5.4-rc0~401
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6982ccecaf32ebf8adfcb66b4225da3b46255621;p=git.git

git-remote: exit with non-zero status after detecting error in "rm".

Exit with non-zero status when "git remote rm" was told to
remove a non-existing remote.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-remote.perl b/git-remote.perl
index 79941e40f..9ca3e7ef3 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -322,7 +322,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 +337,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 +461,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";