From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Dec 2010 00:46:53 +0000 (-0800)
Subject: Merge branch 'jk/commit-die-on-bogus-ident' into next
X-Git-Tag: ko-next~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7785c319da93a518e9bec91ab64a519c5d184a0c;p=git.git

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
---

7785c319da93a518e9bec91ab64a519c5d184a0c
diff --cc builtin/commit.c
index 6c09857a6,3bcb4b7ec..22ba54f9b
--- a/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 *fixup_message, *squash_message;
- static char *author_name, *author_email, *author_date;
  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;