diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-06 21:14:05 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-06 21:29:22 +0100 |
| commit | f854422931713c267a1a38415de478f0c2723b49 (patch) | |
| tree | 36d87f534c9aeb5648cc2a60584916d85deca259 /tests | |
| parent | 0899e14ec8d3eb877f4190882c5c3e92d02c460b (diff) | |
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-makepatches7 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/tests/gdr-makepatches7 b/tests/tests/gdr-makepatches7 index 9c39710..02ea7ab 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 |