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 /debian/changelog | |
| 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 'debian/changelog')
| -rw-r--r-- | debian/changelog | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6d0b613..bfbffd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,20 @@ -dgit (2.14) unstable; urgency=low +dgit (2.15~) unstable; urgency=low * -- +dgit (2.14) unstable; urgency=critical + + CRITICAL BUGFIX: + * Do not generate bogus commits with --overwrite or import-dsc. + Closes:#849041. + + Test suite: + * Run a lot of git-fsck. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 04 Jan 2017 22:52:55 +0000 + dgit (2.13) unstable; urgency=high Changed behaviour: |