chiark / gitweb /
dgit: Do not generate bogus commits
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 4 Jan 2017 21:47:53 +0000 (21:47 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 4 Jan 2017 22:11:08 +0000 (22:11 +0000)
commit3538250e45974480c88df3f4b2ed946ad97e896a
tree31cdde6172c75a3575e3307568e2837e1647e1ae
parent134da599810337360905240c673ab074f3f1427b
dgit: Do not generate bogus commits

There were two places in the code where ill-formed commits were
generated: both psedumerges.

One is in dgit import-dsc, a fairly minor problem.

The other is in --overwrite and is very bad because that's an
important option.

Nothing in git seems to notice, unless you run git-fsck.  Even a git
server does not, by default.  However, some other popular git servers
do reject these broken commits.

I have tested this changes with git-fsck (by using the test suite
patches which follow in this series) and now everything seems fine.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit