From 8f28dfa084b6d63e385d7fe538214eee2f90ea9e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 23:25:48 +0100 Subject: 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 --- tests/tests/gdr-import-dgitview | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/tests/gdr-import-dgitview') 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 -- cgit v1.2.3