Skip to content

Commit

Permalink
mingw: use domain information for default email
Browse files Browse the repository at this point in the history
When a user is registered in a Windows domain, it is really easy to
obtain the email address. So let's do that.

Suggested by Lutz Roeder.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jan 18, 2017
1 parent f844ba7 commit 4e32acf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions compat/mingw.c
Expand Up @@ -1790,6 +1790,11 @@ static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
return NULL;
}

char *mingw_query_user_email(void)
{
return get_extended_user_info(NameUserPrincipal);
}

struct passwd *getpwuid(int uid)
{
static unsigned initialized;
Expand Down
2 changes: 2 additions & 0 deletions compat/mingw.h
Expand Up @@ -417,6 +417,8 @@ static inline void convert_slashes(char *path)
int mingw_offset_1st_component(const char *path);
#define offset_1st_component mingw_offset_1st_component
#define PATH_SEP ';'
extern char *mingw_query_user_email(void);
#define query_user_email mingw_query_user_email
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
#define PRIuMAX "I64u"
#define PRId64 "I64d"
Expand Down
4 changes: 4 additions & 0 deletions git-compat-util.h
Expand Up @@ -370,6 +370,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
Expand Down
4 changes: 3 additions & 1 deletion ident.c
Expand Up @@ -169,7 +169,9 @@ const char *ident_default_email(void)
strbuf_addstr(&git_default_email, email);
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
} else
} else if ((email = query_user_email()) && email[0])
strbuf_addstr(&git_default_email, email);
else
copy_email(xgetpwuid_self(&default_email_is_bogus),
&git_default_email, &default_email_is_bogus);
strbuf_trim(&git_default_email);
Expand Down

0 comments on commit 4e32acf

Please sign in to comment.