mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-remote: exit with non-zero status after detecting errors.
  rebase -i: squash should retain the authorship of the _first_ commit
  git-add--interactive: Improve behavior on bogus input
  git-add--interactive: Allow Ctrl-D to exit
This commit is contained in:
Junio C Hamano
2007-09-29 23:32:36 -07:00
parent f8babc4dab f4bb20cc99
commit 2af89f12c6
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
git-remote.perl
View File

@ -218,7 +218,7 @@ sub prune_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);
@ -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]);
}
return 0;
}
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);
@ -265,6 +266,7 @@ sub show_remote {
print " Local branch(es) pushed with 'git push'\n";
print " @pushed\n";
}
return 0;
}
sub add_remote {
@ -381,9 +383,11 @@ elsif ($ARGV[0] eq 'show') {
print STDERR "Usage: git remote show <remote>\n";
exit(1);
}
my $status = 0;
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) {
@ -409,9 +413,11 @@ elsif ($ARGV[0] eq 'prune') {
print STDERR "Usage: git remote prune <remote>\n";
exit(1);
}
my $status = 0;
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 = ();