dgit-repos-server: Do not reject commits with no author/committer email

But still insist on date, and hence on the actual committer and author
commit header fields.  Peter Green reports that eg 66c65d90db100435 in
upstream linux.git is such a commit (and is accepted by github).
Closes:#863353.

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

diff --git a/debian/changelog b/debian/changelog
index 769fa5c4e1a6e5f339fea45209403d3b663ea1b1..bbcec9e6b4c63038cc44f1127c0aea90005044bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,13 @@ dgit (3.12~) unstable; urgency=medium
   * dgit import: Right error message for missing files in ..
   * dgit import: Avoid making broken symlinks in ..
 
+  Important bugfixes to other components:
+  * dgit-repos-server: Do not reject commits with no author/committer
+    email address (but still insist on date, and hence on the actual
+    committer and author commit header fields).  Peter Green reports that
+    eg 66c65d90db100435 in upstream linux.git is such a commit (and is
+    accepted by github).  Closes:#863353.
+
   Test suite:
   * t-report-fail: print $PWD as part of failure message.
   * import-dsc: Test missing files, particularly in ..

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 55dc81fff1d16b09ca61413df3927574a0658f86..ec9b2c9ae186e8972a4c5bc216aadb2d199a2288 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -902,8 +902,8 @@ sub checks () {
 
     # defend against commits generated by #849041
     if (!($policy & NOCOMMITCHECK)) {
-       my @checks = qw(%ae %at
-                       %ce %ct);
+       my @checks = qw(%at
+                       %ct);
        my @chk = qw(git log -z);
        push @chk, '--pretty=tformat:%H%n'.
            (join "", map { $_, '%n' } @checks);