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, 19 insertions, 0 deletions

diff --git a/tests/lib b/tests/lib
index d075bc7..5fcb6f6 100644
--- a/tests/lib
+++ b/tests/lib
@@ -349,6 +349,25 @@ t-git-dir-check () {
 	esac
 }
 
+t-git-fsck () {
+	git fsck --no-dangling --strict || ${expect_fsck_fail-false}
+}
+
+t-fscks () {
+	(
+	shopt -s nullglob
+	for d in $tmp/*/.git $tmp/git/*.git; do
+		cd "$d"
+		t-git-fsck
+	done
+	)
+}
+
+t-ok () {
+	t-fscks
+	echo ok.
+}
+
 t-rm-dput-dropping () {
 	rm -f $tmp/${p}_${v}_*.upload
 }