diff options
-rwxr-xr-x | git-debrebase | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 630b8c2..059d02b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2412,6 +2412,10 @@ sub check_series_has_all_patches ($) { sub begin_convert_from () { my $head = get_head(); + my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); + + fail "ffq-prev exists, this is already managed by git-debrebase!" + if $ffq_prev && git_get_ref $ffq_prev; return ($head, undef); } |