summaryrefslogtreecommitdiff
path: root/tests/tests/inarchivecopy
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 15:04:07 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 19:50:48 +0000
commit4ef9b0ee8c0e7dd58fab89ad4ec7b660f2ab7e0f (patch)
tree0e03034be352ba0465f796528d1c6dd18024e93f /tests/tests/inarchivecopy
parent85a986b3f5abc50ebd280a4b711a4617d56cd6df (diff)
Test suite: inarchivecopy: Fix tag-vs-remote checking
This was entirely broken, and only works because (a) $vtag^1 does not exist, and (b) this is erroneously not spotted by t-ref-same-*. Instead check that the suite branch has the tag (of the package which has been moved into that suite) as a direct ancestor. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/inarchivecopy')
-rwxr-xr-xtests/tests/inarchivecopy3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index e87baaf..394a214 100755
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -21,6 +21,7 @@ copy-check-good () {
git diff $vtag
t-refs-same refs/remotes/dgit/dgit/stable
t-ref-head
+ t-has-parent HEAD $vtag
}
copy-check () {
@@ -31,8 +32,6 @@ copy-check () {
cd $p
t-refs-same-start
- t-ref-same $vtag^1
-
t-dgit fetch stable
git merge --ff-only dgit/dgit/stable