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: inarchivecopy: Do a "git init" and "git fetch" test too
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 401331a2a8378eeca25aded59e15de76475fb8e5..23daeace743e6e06e0fa36c5e81bdee43670eaa1 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-198,11
+198,11
@@
t-has-ancestor () {
fi
}
fi
}
-t-has-parent () {
- # t-has-parent CHILD PARENT
+t-has-parent
-or-is
() {
+ # t-has-parent
-or-is
CHILD PARENT
local child=$1
local parent=$2
local child=$1
local parent=$2
- local parents=$(git show --pretty=format:' %P ' "$child")
+ local parents=$(git show --pretty=format:' %P
%H
' "$child")
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
@@
-492,14
+492,16
@@
t-ref-same-val () {
case "${t_ref_val-unset}" in
unset) ;;
"$val") ;;
case "${t_ref_val-unset}" in
unset) ;;
"$val") ;;
- *) fail "ref varies:
$name:
\
- ${val:-nothing} != ${t_ref_val:-nothing}" ;;
+ *) fail "ref varies:
($name)
\
+ ${val:-nothing} != ${t_ref_val:-nothing}
(${t_ref_names[*]})
" ;;
esac
t_ref_val="$val"
esac
t_ref_val="$val"
+ t_ref_names+=("$name")
}
t-refs-same-start () {
unset t_ref_val
}
t-refs-same-start () {
unset t_ref_val
+ t_ref_names=()
}
t-refs-same () {
}
t-refs-same () {
@@
-587,6
+589,7
@@
t-splitbrain-pushed-good--unpack () {
mkdir t-unpack
cd t-unpack
ln -s $tmp/mirror/pool/main/*.orig*.tar* .
mkdir t-unpack
cd t-unpack
ln -s $tmp/mirror/pool/main/*.orig*.tar* .
+ ln -s $tmp/incoming/*.orig*.tar* . ||:
ln -s $incoming_dsc .
ln -s ${incoming_dsc/.dsc/.debian.tar}* .
dpkg-source "$@" -x *.dsc
ln -s $incoming_dsc .
ln -s ${incoming_dsc/.dsc/.debian.tar}* .
dpkg-source "$@" -x *.dsc
@@
-616,6
+619,13
@@
t-splitbrain-pushed-good-start () {
git merge-base --is-ancestor $dep14tag $dgittag
t-refs-same-start
git merge-base --is-ancestor $dep14tag $dgittag
t-refs-same-start
+ t-ref-same refs/heads/split.p
+ case "$(t-git-get-ref refs/heads/split.b)" in
+ "$t_ref_val") ;;
+ "$(git rev-parse refs/heads/split.p^0)") ;;
+ "$(git rev-parse refs/heads/split.p^1)") ;;
+ *) fail 'bad b/p' ;;
+ esac
t-pushed-good-core
t-incoming-dsc
t-pushed-good-core
t-incoming-dsc