diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:52:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:52:45 -0800 |
| commit | 16e6e7284f691c8efc0a75cdecace83edbdedbaa (patch) | |
| tree | 483b390a4ba53adc595dcbd825ff57d650061bb0 /cache.h | |
| parent | Merge branch 'fc/send-email-no-sender-prompt' (diff) | |
| parent | t9001: check send-email behavior with implicit sender (diff) | |
| download | git-16e6e7284f691c8efc0a75cdecace83edbdedbaa.tar.gz git-16e6e7284f691c8efc0a75cdecace83edbdedbaa.zip | |
Merge branch 'jk/send-email-sender-prompt'
General clean-ups in various areas, originally written to support a
patch that later turned out to be unneeded.
* jk/send-email-sender-prompt:
t9001: check send-email behavior with implicit sender
t: add tests for "git var"
ident: keep separate "explicit" flags for author and committer
ident: make user_ident_explicitly_given static
t7502: factor out autoident prerequisite
test-lib: allow negation of prerequisites
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1149,11 +1149,8 @@ struct config_include_data { #define CONFIG_INCLUDE_INIT { 0 } extern int git_config_include(const char *name, const char *value, void *data); -#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 int committer_ident_sufficiently_given(void); +extern int author_ident_sufficiently_given(void); extern const char *git_commit_encoding; extern const char *git_log_output_encoding; |