summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:15 (GMT)
commit16ce0b92bdaa50ca8ebb318829e8fde65299d676 (patch)
tree50eaf9377fe649296a66e7907f8c052e9fa89ebc /git-compat-util.h
parent1e5d4548563ce2cab86005360b4bff78bb6b473e (diff)
parent501afcb8b021611758bf07d0e18fa8ff7fbbed73 (diff)
downloadgit-16ce0b92bdaa50ca8ebb318829e8fde65299d676.zip
git-16ce0b92bdaa50ca8ebb318829e8fde65299d676.tar.gz
git-16ce0b92bdaa50ca8ebb318829e8fde65299d676.tar.bz2
Merge branch 'js/mingw-default-ident'
The logic to select the default user name and e-mail on Windows has been improved. * js/mingw-default-ident: mingw: use domain information for default email getpwuid(mingw): provide a better default for the user name getpwuid(mingw): initialize the structure only once
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 48c9555..95cfcc1 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -382,6 +382,10 @@ static inline char *git_find_last_dir_sep(const char *path)
#define find_last_dir_sep git_find_last_dir_sep
#endif
+#ifndef query_user_email
+#define query_user_email() NULL
+#endif
+
#if defined(__HP_cc) && (__HP_cc >= 61000)
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR