git-svn: fail on rebase if we are unable to find a ref to rebase against
If we're on an invalid HEAD, we should detect this and avoid attempting to continue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a97e4075a1
commit
d6bad6610a
@ -435,6 +435,9 @@ sub cmd_rebase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $gs = Git::SVN->find_by_url($url);
|
my $gs = Git::SVN->find_by_url($url);
|
||||||
|
unless ($gs) {
|
||||||
|
die "Unable to determine remote information from URL: $url\n";
|
||||||
|
}
|
||||||
if (command(qw/diff-index HEAD --/)) {
|
if (command(qw/diff-index HEAD --/)) {
|
||||||
print STDERR "Cannot rebase with uncommited changes:\n";
|
print STDERR "Cannot rebase with uncommited changes:\n";
|
||||||
command_noisy('status');
|
command_noisy('status');
|
||||||
|
Loading…
Reference in New Issue
Block a user