X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgitview;h=18d06f5658e26d263c534f55d16f3a036b25bb54;hb=48cd6449acfebc08b1ba2c00871737759c285216;hp=84fc50c4f600fda882e90e652674c5159af67d2c;hpb=e5bae1c8621bb50925404c3ba70c83b037a5b74f;p=dgit.git diff --git a/tests/tests/gdr-import-dgitview b/tests/tests/gdr-import-dgitview index 84fc50c4..18d06f56 100755 --- a/tests/tests/gdr-import-dgitview +++ b/tests/tests/gdr-import-dgitview @@ -22,4 +22,25 @@ t-git-debrebase LC_MESSAGES=C t-git-debrebase status |tee ../bare-output grep 'bare dgit dsc import with no prior history' ../bare-output +git branch before + +t-expect-fail E:'Could not find or construct a suitable upstream commit' \ +t-git-debrebase convert-from-dgit-view --no-origs + +t-git-debrebase convert-from-dgit-view +t-gdr-good laundered + +t-expect-fail E:'already seems to be in git-debrebase format' \ +t-git-debrebase convert-from-dgit-view + +t-refs-same-start +t-ref-head +t-git-debrebase --noop-ok convert-from-dgit-view +t-ref-head + +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 + t-ok