mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
git-svn: exit with status 1 for test failures
Some versions of the SVN libraries cause die() to exit with 255,
and 40cf043389
tightened up
test_expect_failure to reject return values >128.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
0d7a6e4ef9
commit
b42a044f59
1 changed files with 12 additions and 8 deletions
20
git-svn.perl
20
git-svn.perl
|
@ -21,6 +21,7 @@
|
|||
$ENV{LC_ALL} = 'C';
|
||||
$| = 1; # unbuffer STDOUT
|
||||
|
||||
sub fatal (@) { print STDERR $@; exit 1 }
|
||||
# If SVN:: library support is added, please make the dependencies
|
||||
# optional and preserve the capability to use the command-line client.
|
||||
# use eval { require SVN::... } to make it lazy load
|
||||
|
@ -571,7 +572,7 @@ sub commit_lib {
|
|||
$no = 1;
|
||||
}
|
||||
}
|
||||
close $fh or croak $?;
|
||||
close $fh or exit 1;
|
||||
if (! defined $r_new && ! defined $cmt_new) {
|
||||
unless ($no) {
|
||||
die "Failed to parse revision information\n";
|
||||
|
@ -873,13 +874,16 @@ sub commit_diff {
|
|||
print "Committed $_[0]\n";
|
||||
}, @lock)
|
||||
);
|
||||
my $mods = libsvn_checkout_tree($ta, $tb, $ed);
|
||||
if (@$mods == 0) {
|
||||
print "No changes\n$ta == $tb\n";
|
||||
$ed->abort_edit;
|
||||
} else {
|
||||
$ed->close_edit;
|
||||
}
|
||||
eval {
|
||||
my $mods = libsvn_checkout_tree($ta, $tb, $ed);
|
||||
if (@$mods == 0) {
|
||||
print "No changes\n$ta == $tb\n";
|
||||
$ed->abort_edit;
|
||||
} else {
|
||||
$ed->close_edit;
|
||||
}
|
||||
};
|
||||
fatal "$@\n" if $@;
|
||||
$_message = $_file = undef;
|
||||
return $rev_committed;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue