Merge branch 'jk/commit-die-on-bogus-ident' into next

* jk/commit-die-on-bogus-ident:
  commit: die before asking to edit the log message
  ident: die on bogus date format

Conflicts:
	builtin/commit.c

diff --cc builtin/commit.c
index 6c09857a602193857cf8907c1c1c2574053e29e1,3bcb4b7ec040c4896593b75b3e574951891d016f..22ba54f9bb2ea9f9f9f01528e8a155723da7a4da
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -69,8 -69,6 +69,7 @@@ static enum 
  static const char *logfile, *force_author;
  static const char *template_file;
  static char *edit_message, *use_message;
- static char *author_name, *author_email, *author_date;
 +static char *fixup_message, *squash_message;
  static int all, edit_flag, also, interactive, only, amend, signoff;
  static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
  static int no_post_rewrite, allow_empty_message;