X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=af19583099526aa15a0042681753734639210d3f;hb=f0345187fe63a3ef7dcb4ccb90f2b2dd2d384a17;hp=630b8c261967d30838310f5465502952bfcd5cb1;hpb=b68ef4ba62ce372148911de6a9c9b0f69f78c4d8;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 630b8c26..af195830 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2412,6 +2412,15 @@ 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;
+
+    my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast;
+    snag 'already-converted',
+	"ahead of debrebase-last, this is already managed by git-debrebase!"
+	if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
     return ($head, undef);
 }