diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 22:15:28 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | 4cffe29436a86c6aa974db00201cabae1448e0c7 (patch) | |
| tree | 287893393e87dc7e4f7e0de937a3ac96d49c24e2 /tests | |
| parent | 0e85342533163ec4bd8bcae7788b15e7a4a32db6 (diff) | |
git-debrebase: test suite: introduce t-make-new-upstream-tarball
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 10 | ||||
| -rwxr-xr-x | tests/setup/gbp2gdr | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index ed55ecf..74c571a 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -108,3 +108,13 @@ t-some-changes () { done git commit -m "MIXED add both ($token)" } + +t-make-new-upstream-tarball () { + local uv=$1 + git checkout make-upstream + # leaves ust set to filename of orig tarball + echo "upstream $uv" >>docs/README + git commit -a -m "upstream $uv tarball" + ust=example_$uv.orig.tar.gz + git archive -o ../$ust --prefix=example-2.0/ make-upstream +} diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr index 2dbb515..ac949df 100755 --- a/tests/setup/gbp2gdr +++ b/tests/setup/gbp2gdr @@ -37,11 +37,8 @@ git commit -m "patch queue update ($0)" not-gdr-processable : 'fake up an upstream 2.0' -git checkout -b make-upstream upstream -echo upstream-v2 >>docs/README -git commit -a -m "an upstream v2 update" -ust=example_2.0.orig.tar.gz -git archive -o ../$ust --prefix=example-2.0/ make-upstream +git branch make-upstream upstream +t-make-new-upstream-tarball 2.0 : 'make branch names more conventional' git branch -D master |