From 4ef9b0ee8c0e7dd58fab89ad4ec7b660f2ab7e0f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 30 Oct 2016 15:04:07 +0000 Subject: 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 --- tests/tests/inarchivecopy | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3