diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:39:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:39:52 -0800 |
| commit | 15a873d6e85d8089117a6a2141c8158bd370cf49 (patch) | |
| tree | 95e9cbb5c1b4efa101e6a4aeac14ddc90121f138 /cache.h | |
| parent | 07301eaa766efac7818eac7a4a6db0d0c3948d66 (diff) | |
| parent | 8b770a2a24456089c0dd0230035a7d88aee7e26a (diff) | |
| download | git-15a873d6e85d8089117a6a2141c8158bd370cf49.tar.gz | |
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 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -931,7 +931,11 @@ extern const char *config_exclusive_filename; #define MAX_GITNAME (1000) extern char git_default_email[MAX_GITNAME]; extern char git_default_name[MAX_GITNAME]; +#define IDENT_NAME_GIVEN 01 +#define IDENT_MAIL_GIVEN 02 +#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN) extern int user_ident_explicitly_given; +extern int user_ident_sufficiently_given(void); extern const char *git_commit_encoding; extern const char *git_log_output_encoding; |