X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-nostitch;h=c1a52574def3b12ab549907dde10978faf2babaf;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=9eeb94eef751ebc4a17c63334badc84ab260dfda;hpb=c8cdfbd7dbe5f8ec6f9e01094aa3f21d64111408;p=dgit.git diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch index 9eeb94ee..c1a52574 100755 --- a/tests/tests/gdr-import-nostitch +++ b/tests/tests/gdr-import-nostitch @@ -14,7 +14,15 @@ git checkout master git tag -m synthetic debian/1.0-1 -t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp \ +echo '# comment' >>debian/patches/series +git add debian/patches/series +git commit -m 'add a comment' + +t-expect-fail F:-fseries-comments \ +t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp + +t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments \ + convert-from-gbp \ 2>&1 | tee ../convert-msg grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null