summaryrefslogtreecommitdiff
path: root/commit-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-19 22:46:06 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-19 22:46:06 (GMT)
commitb96afa59ebfd2c0902e2fd2653e29f291bf0cac7 (patch)
tree3d6e94ab9fe04737d6ad70e788c031ba551595c9 /commit-tree.c
parent17cf781661e6d38f737f15f53ab552f1e95960d7 (diff)
downloadgit-b96afa59ebfd2c0902e2fd2653e29f291bf0cac7.zip
git-b96afa59ebfd2c0902e2fd2653e29f291bf0cac7.tar.gz
git-b96afa59ebfd2c0902e2fd2653e29f291bf0cac7.tar.bz2
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.
Diffstat (limited to 'commit-tree.c')
-rw-r--r--commit-tree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/commit-tree.c b/commit-tree.c
index 71fce3f..043c7aa 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);