From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 24 Aug 2018 20:12:58 +0000 (+0100)
Subject: test suite: gdr-import-nostitch: Test -fseries-comments
X-Git-Tag: archive/debian/6.10~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;p=dgit.git

test suite: gdr-import-nostitch: Test -fseries-comments

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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