test suite: makepatches7: Add a nasty .gitignore

Prior to the fix for #903130 this prevents both dgit and gdr from
making patches properly.

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

diff --git a/tests/tests/gdr-makepatches7 b/tests/tests/gdr-makepatches7
index 9c3971004a1627ea525e98669f70b3981f960247..02ea7ab31665efd602799e329be6da31fe186c40 100755 (executable)
--- a/tests/tests/gdr-makepatches7
+++ b/tests/tests/gdr-makepatches7
@@ -8,6 +8,15 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
 
 cd $p
 

+git checkout upstream/2.0
+echo '*patch*' >>.gitignore
+git commit -m nasty .gitignore
+git tag v2.1
+GZIP=-1 git archive -o ../${p}_2.1.orig.tar.gz --prefix ${p}/ v2.1
+
+git checkout master
+t-git-debrebase new-upstream 2.1-1
+

 t-some-changes for-rebase-fixup m
 
 t-git-debrebase
 t-some-changes for-rebase-fixup m
 
 t-git-debrebase