From 50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Aug 2018 21:12:58 +0100 Subject: [PATCH] test suite: gdr-import-nostitch: Test -fseries-comments Signed-off-by: Ian Jackson --- tests/tests/gdr-import-nostitch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 -- 2.30.2