From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Jul 2017 11:31:49 +0000 (+0100)
Subject: test suite: Introduce example 1.1 orig containg some interesting objects
X-Git-Tag: archive/debian/3.12~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=cdbf0b43ce179a6ab160830293cb737b2d4cf957

test suite: Introduce example 1.1 orig containg some interesting objects

We are going to want to test alternation/deletion of symlinks and
non-644 files.

To test this we need to switch to using example_1.1.orig.tar.gz (and
the corresponding git branch in the worktree), so that we have
such existing objects.

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

diff --git a/tests/pkg-srcs/example_1.1.orig.tar.gz b/tests/pkg-srcs/example_1.1.orig.tar.gz
new file mode 100644
index 00000000..d975490f
Binary files /dev/null and b/tests/pkg-srcs/example_1.1.orig.tar.gz differ
diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable
index 0d02c6aa..621829e1 100755
--- a/tests/tests/unrepresentable
+++ b/tests/tests/unrepresentable
@@ -4,13 +4,13 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-prep-newpackage example 1.0
+t-prep-newpackage example 1.1
 
 ln -s $troot/pkg-srcs/${p}_${v%-*}.orig.tar.* .
 
 cd $p
 
-start () { git checkout quilt-tip~0; }
+start () { git checkout quilt-tip-1.1~0; }
 attempt () { t-dgit -wgf --quilt=smash quilt-fixup; }
 
 badly-1 () {
diff --git a/tests/worktrees/example_1.0.tar b/tests/worktrees/example_1.0.tar
index 50baa337..3a07a644 100644
Binary files a/tests/worktrees/example_1.0.tar and b/tests/worktrees/example_1.0.tar differ
diff --git a/tests/worktrees/example_1.1.tar b/tests/worktrees/example_1.1.tar
new file mode 120000
index 00000000..6acd590c
--- /dev/null
+++ b/tests/worktrees/example_1.1.tar
@@ -0,0 +1 @@
+example_1.0.tar
\ No newline at end of file