diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-05 14:01:38 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-05 14:03:23 +0000 |
commit | 6b959bf443c37b26f058aed813885c469c660828 (patch) | |
tree | fefaeb74959ddb9b609f1f144ced1560b770eee5 /tests/tests/gbp-orig | |
parent | 7a47622fe7b1a2d1db2f3cb917926e93c683dc2a (diff) | |
parent | f760d1c03dc525167160958971340528c4f3b744 (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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gbp-orig')
-rwxr-xr-x | tests/tests/gbp-orig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig index 29dd457..beea121 100755 --- a/tests/tests/gbp-orig +++ b/tests/tests/gbp-orig @@ -74,4 +74,4 @@ done cd $tmp diff -ruN gbp-output/tar-x tar-x -echo done. +t-ok |