path: root/tests/tests/drs-push-rejects
diff options
authorIan Jackson <>2017-01-05 14:01:38 +0000
committerIan Jackson <>2017-01-05 14:03:23 +0000
commit6b959bf443c37b26f058aed813885c469c660828 (patch)
treefefaeb74959ddb9b609f1f144ced1560b770eee5 /tests/tests/drs-push-rejects
parent7a47622fe7b1a2d1db2f3cb917926e93c683dc2a (diff)
parentf760d1c03dc525167160958971340528c4f3b744 (diff)
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 <>
Diffstat (limited to 'tests/tests/drs-push-rejects')
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 7b7c5f3..dee14b8 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -203,4 +203,7 @@ mustfail "not in permissions list although in keyring" $push_spec
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-echo ok.
+# we generate some junk, so we must tolerate git-fsck complaining