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/multisuite | |
| 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/multisuite')
| -rwxr-xr-x | tests/tests/multisuite | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/multisuite b/tests/tests/multisuite index 0a580be..d39475b 100755 --- a/tests/tests/multisuite +++ b/tests/tests/multisuite @@ -54,4 +54,4 @@ multi-good t-has-parent-or-is HEAD $rcombined -echo ok. +t-ok |