Test suite: Make t-ref-same* errors better by tracking and printing names

[dgit.git] / tests / tests / inarchivecopy

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index fbd197dca7549f4d7bb00011f4f6b77396394035..394a21483ea6e64cd1f0172e02ad189f85b0e8ca 100755 (executable)
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -2,9 +2,8 @@
 set -e
 . tests/lib
 
-t-restrict x-dgit-unfinished
-
 t-setup-import examplegit
+t-tstunt-parsechangelog
 
 cd $p
 git checkout -b dgit/stable dgit/dgit/stable
@@ -22,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 () {
@@ -32,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
 
@@ -59,4 +57,4 @@ copy-check 2.0
 
 copy-check 2.1
 
-xxx rest of test
+echo ok.