diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
| commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
| tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /tests/lib | |
| parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
| parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) | |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -777,11 +777,12 @@ t-splitbrain-pushed-good-start () { t-refs-same-start t-ref-same refs/heads/split.p - case "$(t-git-get-ref refs/heads/split.b)" in + local split_b=$(t-git-get-ref refs/heads/split.b) + case "$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' ;; + *) fail "bad b/p (b=$split_b)" ;; esac t-pushed-good-core @@ -1027,7 +1028,6 @@ t-git-pseudo-merge () { } t-gbp-example-prep-no-ff () { - t-tstunt-parsechangelog t-archive example 1.0-1 t-git-none t-worktree 1.0 @@ -1187,7 +1187,7 @@ t-debpolicy () { t-dsd t-policy dgit-repos-policy-debian - mkdir $tmp/git + mkdir -p $tmp/git t-policy-admin create-db } @@ -1236,7 +1236,6 @@ t-tagupl-test () { cd ../$p t-dgit fetch - t-pushed-good master } t-buildproductsdir-config () { |