From 3367a5049a0032c13023bdb930c0c80bc326c49c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 23:16:17 +0100 Subject: 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 --- git-debrebase | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-debrebase') 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); } -- cgit v1.2.3