diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | git-debrebase | 3 | ||||
| -rwxr-xr-x | tests/tests/gdr-import-dgitview | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 614a576..3ac55a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ dgit (6.7~) unstable; urgency=medium * 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. -- 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); } diff --git a/tests/tests/gdr-import-dgitview b/tests/tests/gdr-import-dgitview index 3670deb..18d06f5 100755 --- a/tests/tests/gdr-import-dgitview +++ b/tests/tests/gdr-import-dgitview @@ -38,7 +38,8 @@ t-ref-head 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 |