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>
* git-debrebase: convert-from-gbp: Improve messages. Closes:#906641.
* git-debrebase: Highly experimental merge resolution support,
enabled only with special command line option.
+ * git-debrebase: Check in convert-from-* whether ffq-prev or
+ debrebase-last indicate that we are already in gdr format.
--
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);
}
t-git-debrebase --noop-ok convert-from-dgit-view
t-ref-head
-t-git-debrebase convert-from-dgit-view --always-convert-anyway
+t-git-debrebase -falready-converted convert-from-dgit-view \
+ --always-convert-anyway
t-expect-fail E:'ref varies' t-ref-head
t-gdr-good laundered