aboutsummaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-03-31 14:00:18 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-31 15:22:59 -0700
commitd6bad6610aece0bcaf4449ce170de22970793110 (patch)
treef0c8c4bf8c6b99b9dcd12a9f24f894e7dfaaf2de /git-svn.perl
parenta97e4075a16e0cbdf9c4aed736b5e762e035508b (diff)
downloadgit-d6bad6610aece0bcaf4449ce170de22970793110.tar.gz
git-d6bad6610aece0bcaf4449ce170de22970793110.tar.xz
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 278f45d6d..d307d430f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -435,6 +435,9 @@ sub cmd_rebase {
}
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 --/)) {
print STDERR "Cannot rebase with uncommited changes:\n";
command_noisy('status');