chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a47622 f760d1c)
Merge tag dgit/2.14 into `defence in dgit-repos-server' branch
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 5 Jan 2017 14:01:38 +0000 (14:01 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 5 Jan 2017 14:03:23 +0000 (14:03 +0000)
commit6b959bf443c37b26f058aed813885c469c660828
treefefaeb74959ddb9b609f1f144ced1560b770eee5tree | snapshot
parent7a47622fe7b1a2d1db2f3cb917926e93c683dc2acommit | diff
parentf760d1c03dc525167160958971340528c4f3b744commit | 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>
debian/changelog diff1 | diff2 | blob | history
tests/lib diff1 | diff2 | blob | history
tests/tests/drs-push-rejects diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.