diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:16:17 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:43:07 +0100 |
commit | 3367a5049a0032c13023bdb930c0c80bc326c49c (patch) | |
tree | aa5a9e7e4612304f8e2faff8f462f783e78bee83 | |
parent | b68ef4ba62ce372148911de6a9c9b0f69f78c4d8 (diff) |
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>
-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); } |