Merge branch 'jc/ident'

* jc/ident:
  ident.c: replace fprintf with fputs to suppress compiler warning
  user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
  ident.c: treat $EMAIL as giving user.email identity explicitly
  ident.c: check explicit identity for name and email separately
  ident.c: remove unused variables
This commit is contained in:
Junio C Hamano
2010-01-20 14:39:52 -08:00
4 changed files with 24 additions and 13 deletions

View File

@ -633,7 +633,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
author_ident);
free(author_ident);
if (!user_ident_explicitly_given)
if (!user_ident_sufficiently_given())
fprintf(fp,
"%s"
"# Committer: %s\n",