From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 22:16:17 +0000 (+0100)
Subject: git-debrebase: Refuse to start conversion if ffq-prev exists
X-Git-Tag: archive/debian/6.7~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3367a5049a0032c13023bdb930c0c80bc326c49c

git-debrebase: Refuse to start conversion if ffq-prev exists

Trying to rerun git-debrebase convert-from-something, on an unstitched
gdr branch, would end in tears.  Forbid it utterly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 630b8c26..059d02b5 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);
 }