From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Aug 2016 00:37:43 +0000 (+0100)
Subject: Test suite: inarchivecopy: use t-sametree-parent
X-Git-Tag: archive/debian/2.0~193
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d50903862956d7091cc0851c8d518dd970ffcce4;p=dgit.git

Test suite: inarchivecopy: use t-sametree-parent

Otherwise different history between fetch and clone breaks the test.

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

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index ed0bcae2..fbd197dc 100755
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -38,14 +38,21 @@ copy-check () {
 	 git merge --ff-only dgit/dgit/stable
 
 	 copy-check-good
+	 local fetched=$(t-sametree-parent HEAD)
 	cd ..
 
 	rm -rf example.cloned
 	t-dgit clone $p stable example.cloned
 
 	cd example.cloned
+	 t-refs-same-start
 	 copy-check-good
+	 local cloned=$(t-sametree-parent HEAD)	 
 	cd ..
+
+	t-refs-same-start
+	t-ref-same-val fetched $fetched
+	t-ref-same-val cloned $cloned
 }
 
 copy-check 2.0