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: t-splitbrain-pushed-good--unpack: Handle new .origs
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 039484d0cb7711e9dd54c3cb3cfc662eeea21d20..6c55cba2a579fa83e4434972eea9b54831765c76 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-589,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
@@
-618,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