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: 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 e87baaf3252f75c486a678d7127c20fd38f41ccb..394a21483ea6e64cd1f0172e02ad189f85b0e8ca 100755
(executable)
--- 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