From b96afa59ebfd2c0902e2fd2653e29f291bf0cac7 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 19 Apr 2005 15:46:06 -0700 Subject: [PATCH] Make us be better at guessing a good hostname for the email. It's still just a guess, and the result is not a real email address anyway. If you want to, you can use COMMIT_AUTHOR_EMAIL to correct for any git guesses. --- commit-tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commit-tree.c b/commit-tree.c index 71fce3f35..043c7aa37 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -317,8 +317,10 @@ int main(int argc, char **argv) memcpy(realemail, pw->pw_name, len); realemail[len] = '@'; gethostname(realemail+len+1, sizeof(realemail)-len-1); - strcat(realemail, "."); - getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1); + if (!strchr(realemail+len+1, '.')) { + strcat(realemail, "."); + getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1); + } time(&now); tm = localtime(&now); -- 2.30.2