git-debrebase: test suite: t-gdr-good: fix comment

[dgit.git] / tests / tests / inarchivecopy

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index 411f56091a25ed9623555c6e46aee873ff9f781b..3f848815d551d4fea97947e371356def45fb6663 100755 (executable)
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -14,7 +14,7 @@ t-inarchive-copy () {
        local from=${2:-sid}
        local to=${3:-stable}
        egrep "^${vm//./\\.}" aq/package.$from.$p >>aq/package.$to.$p
-       t-archive-updated $to $p
+       t-aq-archive-updated $to $p
 }
 
 copy-check-good () {
@@ -37,7 +37,7 @@ copy-check () {
         git merge --ff-only dgit/dgit/$tosuite
 
         copy-check-good
-        local fetched=$(t-sametree-parent HEAD)
+        local fetched; fetched=$(t-sametree-parent HEAD)
        cd ..
 
        rm -rf example.cloned
@@ -46,7 +46,7 @@ copy-check () {
        cd example.cloned
         t-refs-same-start
         copy-check-good
-        local cloned=$(t-sametree-parent HEAD)  
+        local cloned; cloned=$(t-sametree-parent HEAD)  
        cd ..
 
        rm -rf example.initd
@@ -57,7 +57,7 @@ copy-check () {
         t-dgit -p $p fetch $tosuite
         git reset --hard refs/remotes/dgit/dgit/$tosuite
         copy-check-good
-        local initd=$(t-sametree-parent HEAD)
+        local initd; initd=$(t-sametree-parent HEAD)
        cd ..
 
        t-refs-same-start
@@ -70,4 +70,10 @@ copy-check 2.0
 
 copy-check 2.1
 
-echo ok.
+cd $p
+git checkout -b dgit/testing $(v=1.1 t-v-tag)
+cd ..
+
+copy-check 2.1 testing
+
+t-ok