diff options
author | Eric Wong <normalperson@yhbt.net> | 2007-03-31 14:00:18 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-31 15:22:59 -0700 |
commit | d6bad6610aece0bcaf4449ce170de22970793110 (patch) | |
tree | f0c8c4bf8c6b99b9dcd12a9f24f894e7dfaaf2de /git-svn.perl | |
parent | Keep rename/rename conflicts of intermediate merges while doing recursive merge (diff) | |
download | tgif-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-x | git-svn.perl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index 278f45d6d0..d307d430f3 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'); |