chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: Add t-tstunt-parsechangelog to a couple of tests
[dgit.git]
/
tests
/
tests
/
inarchivecopy
diff --git
a/tests/tests/inarchivecopy
b/tests/tests/inarchivecopy
index ed0bcae20639ba21145909be68e64486573fba11..e87baaf3252f75c486a678d7127c20fd38f41ccb 100755
(executable)
--- a/
tests/tests/inarchivecopy
+++ b/
tests/tests/inarchivecopy
@@
-2,9
+2,8
@@
set -e
. tests/lib
set -e
. tests/lib
-t-restrict x-dgit-unfinished
-
t-setup-import examplegit
t-setup-import examplegit
+t-tstunt-parsechangelog
cd $p
git checkout -b dgit/stable dgit/dgit/stable
cd $p
git checkout -b dgit/stable dgit/dgit/stable
@@
-38,18
+37,25
@@
copy-check () {
git merge --ff-only dgit/dgit/stable
copy-check-good
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
cd ..
rm -rf example.cloned
t-dgit clone $p stable example.cloned
cd example.cloned
+ t-refs-same-start
copy-check-good
copy-check-good
+ local cloned=$(t-sametree-parent HEAD)
cd ..
cd ..
+
+ t-refs-same-start
+ t-ref-same-val fetched $fetched
+ t-ref-same-val cloned $cloned
}
copy-check 2.0
copy-check 2.1
}
copy-check 2.0
copy-check 2.1
-xxx rest of test
+echo ok.