Merge tag dgit/2.14 into `defence in dgit-repos-server' branch

Fix up semantic conflict: the new git-fsck test (in 2.14) fails on the
new broken commits (in the `defence in dgit-repos-server' branch).

We need to disable this.  Ideally we would make a tighter test, but
that's too much to do in a merge.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/tests/spelling b/tests/tests/spelling
index 74541b7..ed1290c 100755
--- a/tests/tests/spelling
+++ b/tests/tests/spelling
@@ -13,4 +13,4 @@ set -e
 
 test $rc = 1
 
-echo ok.
+t-ok