File tree Expand file tree Collapse file tree 4 files changed +14
-0
lines changed Expand file tree Collapse file tree 4 files changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -1826,6 +1826,11 @@ static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
1826
1826
return NULL ;
1827
1827
}
1828
1828
1829
+ char * mingw_query_user_email (void )
1830
+ {
1831
+ return get_extended_user_info (NameUserPrincipal );
1832
+ }
1833
+
1829
1834
struct passwd * getpwuid (int uid )
1830
1835
{
1831
1836
static unsigned initialized ;
Original file line number Diff line number Diff line change @@ -424,6 +424,8 @@ static inline void convert_slashes(char *path)
424
424
int mingw_offset_1st_component (const char * path );
425
425
#define offset_1st_component mingw_offset_1st_component
426
426
#define PATH_SEP ';'
427
+ extern char * mingw_query_user_email (void );
428
+ #define query_user_email mingw_query_user_email
427
429
#if !defined(__MINGW64_VERSION_MAJOR ) && (!defined(_MSC_VER ) || _MSC_VER < 1800 )
428
430
#define PRIuMAX "I64u"
429
431
#define PRId64 "I64d"
Original file line number Diff line number Diff line change @@ -382,6 +382,10 @@ static inline char *git_find_last_dir_sep(const char *path)
382
382
#define find_last_dir_sep git_find_last_dir_sep
383
383
#endif
384
384
385
+ #ifndef query_user_email
386
+ #define query_user_email () NULL
387
+ #endif
388
+
385
389
#if defined(__HP_cc ) && (__HP_cc >= 61000 )
386
390
#define NORETURN __attribute__((noreturn))
387
391
#define NORETURN_PTR
Original file line number Diff line number Diff line change @@ -168,6 +168,9 @@ const char *ident_default_email(void)
168
168
strbuf_addstr (& git_default_email , email );
169
169
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN ;
170
170
author_ident_explicitly_given |= IDENT_MAIL_GIVEN ;
171
+ } else if ((email = query_user_email ()) && email [0 ]) {
172
+ strbuf_addstr (& git_default_email , email );
173
+ free ((char * )email );
171
174
} else
172
175
copy_email (xgetpwuid_self (& default_email_is_bogus ),
173
176
& git_default_email , & default_email_is_bogus );
You can’t perform that action at this time.
0 commit comments