summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/tests/gdr-import-nostitch10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch
index 9eeb94e..c1a5257 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