diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:39:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:39:52 (GMT) |
| commit | 15a873d6e85d8089117a6a2141c8158bd370cf49 (patch) | |
| tree | 95e9cbb5c1b4efa101e6a4aeac14ddc90121f138 /builtin-commit.c | |
| parent | 07301eaa766efac7818eac7a4a6db0d0c3948d66 (diff) | |
| parent | 8b770a2a24456089c0dd0230035a7d88aee7e26a (diff) | |
| download | git-15a873d6e85d8089117a6a2141c8158bd370cf49.zip git-15a873d6e85d8089117a6a2141c8158bd370cf49.tar.gz git-15a873d6e85d8089117a6a2141c8158bd370cf49.tar.bz2 | |
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
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 69241f8..9b9dbaa 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -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", |