diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:25:48 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:43:08 +0100 |
commit | 8f28dfa084b6d63e385d7fe538214eee2f90ea9e (patch) | |
tree | 6af6b90b3c12ff02ab8a2c718e4f0e09249a3885 /git-debrebase | |
parent | 3367a5049a0032c13023bdb930c0c80bc326c49c (diff) |
git-debrebase: Snag on repeated conversions
If debrebase-last says we are ahead of some previous gdr work, it is
carrying on is unlikely to be helpful. It would only be sensible if
the package is vacillating between branch formats, and this is
reflected and visible in the branch history.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 059d02b..d80c8d3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2416,6 +2416,9 @@ sub begin_convert_from () { fail "ffq-prev exists, this is already managed by git-debrebase!" if $ffq_prev && git_get_ref $ffq_prev; + snag 'already-converted', + "ahead of debrebase-last, this is already managed by git-debrebase!" + if $gdrlast && git_get_ref $gdrlast && is_fast_fwd $gdrlast, $head; return ($head, undef); } |