From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jul 2018 20:14:05 +0000 (+0100)
Subject: test suite: makepatches7: Add a nasty .gitignore
X-Git-Tag: archive/debian/5.8~6
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f854422931713c267a1a38415de478f0c2723b49;hp=0899e14ec8d3eb877f4190882c5c3e92d02c460b;ds=sidebyside

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 9c397100..02ea7ab3 100755
--- a/tests/tests/gdr-makepatches7
+++ b/tests/tests/gdr-makepatches7
@@ -8,6 +8,15 @@ t-setup-import gdr-convert-gbp
 
 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