aboutsummaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-10-11 18:47:34 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-11 18:47:34 -0700
commite1b10391eabdaaa4c89c53099dd96d5f9d978719 (patch)
tree7405cbb4b0e0b149614f4948d66e316c51f97a49 /ident.c
parentec2d15118bd6aa24e9323302e9aaa71dd54bc028 (diff)
downloadgit-e1b10391eabdaaa4c89c53099dd96d5f9d978719.tar.gz
git-e1b10391eabdaaa4c89c53099dd96d5f9d978719.tar.xz
Use git config file for committer name and email info
This starts using the "user.name" and "user.email" config variables if they exist as the default name and email when committing. This means that you don't have to use the GIT_COMMITTER_EMAIL environment variable to override your email - you can just edit the config file instead. The patch looks bigger than it is because it makes the default name and email information non-static and renames it appropriately. And it moves the common git environment variables into a new library file, so that you can link against libgit.a and get the git environment without having to link in zlib and libcrypt. In short, most of it is renaming and moving, the real change core is just a few new lines in "git_default_config()" that copies the user config values to the new base. It also changes "git-var -l" to list the config variables. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/ident.c b/ident.c
index 562f5f181..7a9f5672e 100644
--- a/ident.c
+++ b/ident.c
@@ -11,9 +11,7 @@
#include <time.h>
#include <ctype.h>
-static char real_email[1000];
-static char real_name[1000];
-static char real_date[50];
+static char git_default_date[50];
static void copy_gecos(struct passwd *w, char *name, int sz)
{
@@ -58,22 +56,22 @@ int setup_ident(void)
die("You don't exist. Go away!");
/* Get the name ("gecos") */
- copy_gecos(pw, real_name, sizeof(real_name));
+ copy_gecos(pw, git_default_name, sizeof(git_default_name));
/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
len = strlen(pw->pw_name);
- if (len > sizeof(real_email)/2)
+ if (len > sizeof(git_default_email)/2)
die("Your sysadmin must hate you!");
- memcpy(real_email, pw->pw_name, len);
- real_email[len++] = '@';
- gethostname(real_email + len, sizeof(real_email) - len);
- if (!strchr(real_email+len, '.')) {
- len = strlen(real_email);
- real_email[len++] = '.';
- getdomainname(real_email+len, sizeof(real_email)-len);
+ memcpy(git_default_email, pw->pw_name, len);
+ git_default_email[len++] = '@';
+ gethostname(git_default_email + len, sizeof(git_default_email) - len);
+ if (!strchr(git_default_email+len, '.')) {
+ len = strlen(git_default_email);
+ git_default_email[len++] = '.';
+ getdomainname(git_default_email+len, sizeof(git_default_email)-len);
}
/* And set the default date */
- datestamp(real_date, sizeof(real_date));
+ datestamp(git_default_date, sizeof(git_default_date));
return 0;
}
@@ -159,10 +157,10 @@ char *get_ident(const char *name, const char *email, const char *date_str)
int i;
if (!name)
- name = real_name;
+ name = git_default_name;
if (!email)
- email = real_email;
- strcpy(date, real_date);
+ email = git_default_email;
+ strcpy(date, git_default_date);
if (date_str)
parse_date(date_str, date, sizeof(date));