Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-remote: exit with non-zero status after detecting errors.
author
Jari Aalto
<jari.aalto@cante.net>
Sun, 30 Sep 2007 06:29:43 +0000
(23:29 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 30 Sep 2007 06:32:31 +0000
(23:32 -0700)
Some subcommands of "git-remote" detected and issued error
messages but did not signal that to the calling process with
exit status.
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-remote.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
81ab1cb
)
diff --git
a/git-remote.perl
b/git-remote.perl
index 01cf480221be1e5860bd701d5d17ced25766d38d..8e2dc4de733efe1803d42f5ba4f35ca1be683ad0 100755
(executable)
--- a/
git-remote.perl
+++ b/
git-remote.perl
@@
-218,7
+218,7
@@
sub prune_remote {
my ($name, $ls_remote) = @_;
if (!exists $remote->{$name}) {
print STDERR "No such remote $name\n";
my ($name, $ls_remote) = @_;
if (!exists $remote->{$name}) {
print STDERR "No such remote $name\n";
- return;
+ return
1
;
}
my $info = $remote->{$name};
update_ls_remote($ls_remote, $info);
}
my $info = $remote->{$name};
update_ls_remote($ls_remote, $info);
@@
-229,13
+229,14
@@
sub prune_remote {
my @v = $git->command(qw(rev-parse --verify), "$prefix/$to_prune");
$git->command(qw(update-ref -d), "$prefix/$to_prune", $v[0]);
}
my @v = $git->command(qw(rev-parse --verify), "$prefix/$to_prune");
$git->command(qw(update-ref -d), "$prefix/$to_prune", $v[0]);
}
+ return 0;
}
sub show_remote {
my ($name, $ls_remote) = @_;
if (!exists $remote->{$name}) {
print STDERR "No such remote $name\n";
}
sub show_remote {
my ($name, $ls_remote) = @_;
if (!exists $remote->{$name}) {
print STDERR "No such remote $name\n";
- return;
+ return
1
;
}
my $info = $remote->{$name};
update_ls_remote($ls_remote, $info);
}
my $info = $remote->{$name};
update_ls_remote($ls_remote, $info);
@@
-265,6
+266,7
@@
sub show_remote {
print " Local branch(es) pushed with 'git push'\n";
print " @pushed\n";
}
print " Local branch(es) pushed with 'git push'\n";
print " @pushed\n";
}
+ return 0;
}
sub add_remote {
}
sub add_remote {
@@
-351,9
+353,11
@@
sub add_usage {
print STDERR "Usage: git remote show <remote>\n";
exit(1);
}
print STDERR "Usage: git remote show <remote>\n";
exit(1);
}
+ my $status = 0;
for (; $i < @ARGV; $i++) {
for (; $i < @ARGV; $i++) {
- show_remote($ARGV[$i], $ls_remote);
+
$status |=
show_remote($ARGV[$i], $ls_remote);
}
}
+ exit($status);
}
elsif ($ARGV[0] eq 'update') {
if (@ARGV <= 1) {
}
elsif ($ARGV[0] eq 'update') {
if (@ARGV <= 1) {
@@
-379,9
+383,11
@@
sub add_usage {
print STDERR "Usage: git remote prune <remote>\n";
exit(1);
}
print STDERR "Usage: git remote prune <remote>\n";
exit(1);
}
+ my $status = 0;
for (; $i < @ARGV; $i++) {
for (; $i < @ARGV; $i++) {
- prune_remote($ARGV[$i], $ls_remote);
+
$status |=
prune_remote($ARGV[$i], $ls_remote);
}
}
+ exit($status);
}
elsif ($ARGV[0] eq 'add') {
my %opts = ();
}
elsif ($ARGV[0] eq 'add') {
my %opts = ();