{"thread":{"id":"2076","subject":"Use git config file for committer name and email info","startedAt":"2005-10-12T00:54:44Z","lastAt":"2005-10-12T00:54:44Z","messageCount":1,"participants":["Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"9987","messageId":"Pine.LNX.4.64.0510111735300.14597@g5.osdl.org","threadId":"2076","inReplyTo":null,"subject":"Use git config file for committer name and email info","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-10-12T00:54:44Z","receivedAt":"2005-10-12T00:54:44Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nThis starts using the \"user.name\" and \"user.email\" config variables if\nthey exist as the default name and email when committing.  This means\nthat you don't have to use the GIT_COMMITTER_EMAIL environment variable\nto override your email - you can just edit the config file instead.\n\nThe patch looks bigger than it is because it makes the default name and\nemail information non-static and renames it appropriately.  And it moves\nthe common git environment variables into a new library file, so that\nyou can link against libgit.a and get the git environment without having\nto link in zlib and libcrypt.\n\nIn short, most of it is renaming and moving, the real change core is\njust a few new lines in \"git_default_config()\" that copies the user\nconfig values to the new base.\n\nIt also changes \"git-var -l\" to list the config variables.\n\nSigned-off-by: Linus Torvalds <torvalds@osdl.org>\n---\n\nWith this, you can now have a .git/config file that has something like \nthis in it:\n\n\t[user]\n\t   name = Linus Torvalds\n\t   email = torvalds@osdl.org\n\n\t[core]\n\t   filemode = false\n\nand it will do the obvious thing. The \"user.name\" and \"user.email\" \nvariables will be used by default for the name information, overriding any \nsystem information from /etc/passwd etc.\n\nNOTE! The GIT_{COMMITTER|AUTHOR}_NAME and GIT_{COMMITTER|AUTHOR}_EMAIL \nenvironment variables continue to override any config file information. \n\nAlso, we should probably verify that the name/email is valid (ie doesn't \ncontain any of the characters \"<>\\n\" that could cause invalid commit \nobjects).\n\nThe fact that \"git-var -l\" now also shows all config info can be useful. \n\nFor example, scripts can use it to pick up stuff from the config file, ie \nwe could make \"git tag\" get the default key from there by adding something \nlike\n\n\tkey=$(git-var -l | sed -n '/^user\\.key=/ { s/user.key=//;p;q}')\n\nto the script, which again allows us to have a convenient default value in \nthe config file without littering us up with more environment variables.\n\nHmm?\n\nThis hasn't gotten a ton of testing, but I did do a test-commit with this, \nand it all seems to work.\n\n---\n Makefile      |    2 +-\n cache.h       |    4 +++\n commit-tree.c |    4 ++-\n config.c      |   10 ++++++++\n environment.c |   75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n ident.c       |   30 +++++++++++------------\n read-cache.c  |    1 -\n sha1_file.c   |   59 ---------------------------------------------\n var.c         |   11 ++++++++\n 9 files changed, 118 insertions(+), 78 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 8697d52..ee3a752 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -158,7 +158,7 @@ LIB_OBJS = \\\n \tobject.o pack-check.o patch-delta.o path.o pkt-line.o \\\n \tquote.o read-cache.o refs.o run-command.o \\\n \tserver-info.o setup.o sha1_file.o sha1_name.o strbuf.o \\\n-\ttag.o tree.o usage.o config.o $(DIFF_OBJS)\n+\ttag.o tree.o usage.o config.o environment.o $(DIFF_OBJS)\n \n LIBS = $(LIB_FILE)\n LIBS += -lz\ndiff --git a/cache.h b/cache.h\nindex 41cc22c..1a7e047 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -382,4 +382,8 @@ extern int git_config(config_fn_t fn);\n extern int git_config_int(const char *, const char *);\n extern int git_config_bool(const char *, const char *);\n \n+#define MAX_GITNAME (1000)\n+extern char git_default_email[MAX_GITNAME];\n+extern char git_default_name[MAX_GITNAME];\n+\n #endif /* CACHE_H */\ndiff --git a/commit-tree.c b/commit-tree.c\nindex b1ef0b5..030fb70 100644\n--- a/commit-tree.c\n+++ b/commit-tree.c\n@@ -89,6 +89,9 @@ int main(int argc, char **argv)\n \tchar *buffer;\n \tunsigned int size;\n \n+\tsetup_ident();\n+\tgit_config(git_default_config);\n+\n \tif (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)\n \t\tusage(commit_tree_usage);\n \n@@ -104,7 +107,6 @@ int main(int argc, char **argv)\n \t}\n \tif (!parents)\n \t\tfprintf(stderr, \"Committing initial tree %s\\n\", argv[1]);\n-\tsetup_ident();\n \n \tinit_buffer(&buffer, &size);\n \tadd_buffer(&buffer, &size, \"tree %s\\n\", sha1_to_hex(tree_sha1));\ndiff --git a/config.c b/config.c\nindex 510456c..cf80358 100644\n--- a/config.c\n+++ b/config.c\n@@ -207,6 +207,16 @@ int git_default_config(const char *var, \n \t\treturn 0;\n \t}\n \n+\tif (!strcmp(var, \"user.name\")) {\n+\t\tstrncpy(git_default_name, value, sizeof(git_default_name));\n+\t\treturn 0;\n+\t}\n+\n+\tif (!strcmp(var, \"user.email\")) {\n+\t\tstrncpy(git_default_email, value, sizeof(git_default_email));\n+\t\treturn 0;\n+\t}\n+\n \t/* Add other config variables here.. */\n \treturn 0;\n }\ndiff --git a/environment.c b/environment.c\nnew file mode 100644\nindex 0000000..1dc7af5\n--- /dev/null\n+++ b/environment.c\n@@ -0,0 +1,75 @@\n+/*\n+ * We put all the git config variables in this same object\n+ * file, so that programs can link against the config parser\n+ * without having to link against all the rest of git.\n+ *\n+ * In particular, no need to bring in libz etc unless needed,\n+ * even if you might want to know where the git directory etc\n+ * are.\n+ */\n+#include \"cache.h\"\n+\n+char git_default_email[MAX_GITNAME];\n+char git_default_name[MAX_GITNAME];\n+int trust_executable_bit = 1;\n+\n+static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,\n+\t*git_graft_file;\n+static void setup_git_env(void)\n+{\n+\tgit_dir = getenv(GIT_DIR_ENVIRONMENT);\n+\tif (!git_dir)\n+\t\tgit_dir = DEFAULT_GIT_DIR_ENVIRONMENT;\n+\tgit_object_dir = getenv(DB_ENVIRONMENT);\n+\tif (!git_object_dir) {\n+\t\tgit_object_dir = xmalloc(strlen(git_dir) + 9);\n+\t\tsprintf(git_object_dir, \"%s/objects\", git_dir);\n+\t}\n+\tgit_refs_dir = xmalloc(strlen(git_dir) + 6);\n+\tsprintf(git_refs_dir, \"%s/refs\", git_dir);\n+\tgit_index_file = getenv(INDEX_ENVIRONMENT);\n+\tif (!git_index_file) {\n+\t\tgit_index_file = xmalloc(strlen(git_dir) + 7);\n+\t\tsprintf(git_index_file, \"%s/index\", git_dir);\n+\t}\n+\tgit_graft_file = getenv(GRAFT_ENVIRONMENT);\n+\tif (!git_graft_file)\n+\t\tgit_graft_file = strdup(git_path(\"info/grafts\"));\n+}\n+\n+char *get_git_dir(void)\n+{\n+\tif (!git_dir)\n+\t\tsetup_git_env();\n+\treturn git_dir;\n+}\n+\n+char *get_object_directory(void)\n+{\n+\tif (!git_object_dir)\n+\t\tsetup_git_env();\n+\treturn git_object_dir;\n+}\n+\n+char *get_refs_directory(void)\n+{\n+\tif (!git_refs_dir)\n+\t\tsetup_git_env();\n+\treturn git_refs_dir;\n+}\n+\n+char *get_index_file(void)\n+{\n+\tif (!git_index_file)\n+\t\tsetup_git_env();\n+\treturn git_index_file;\n+}\n+\n+char *get_graft_file(void)\n+{\n+\tif (!git_graft_file)\n+\t\tsetup_git_env();\n+\treturn git_graft_file;\n+}\n+\n+\ndiff --git a/ident.c b/ident.c\nindex 562f5f1..7a9f567 100644\n--- a/ident.c\n+++ b/ident.c\n@@ -11,9 +11,7 @@\n #include <time.h>\n #include <ctype.h>\n \n-static char real_email[1000];\n-static char real_name[1000];\n-static char real_date[50];\n+static char git_default_date[50];\n \n static void copy_gecos(struct passwd *w, char *name, int sz)\n {\n@@ -58,22 +56,22 @@ int setup_ident(void)\n \t\tdie(\"You don't exist. Go away!\");\n \n \t/* Get the name (\"gecos\") */\n-\tcopy_gecos(pw, real_name, sizeof(real_name));\n+\tcopy_gecos(pw, git_default_name, sizeof(git_default_name));\n \n \t/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */\n \tlen = strlen(pw->pw_name);\n-\tif (len > sizeof(real_email)/2)\n+\tif (len > sizeof(git_default_email)/2)\n \t\tdie(\"Your sysadmin must hate you!\");\n-\tmemcpy(real_email, pw->pw_name, len);\n-\treal_email[len++] = '@';\n-\tgethostname(real_email + len, sizeof(real_email) - len);\n-\tif (!strchr(real_email+len, '.')) {\n-\t\tlen = strlen(real_email);\n-\t\treal_email[len++] = '.';\n-\t\tgetdomainname(real_email+len, sizeof(real_email)-len);\n+\tmemcpy(git_default_email, pw->pw_name, len);\n+\tgit_default_email[len++] = '@';\n+\tgethostname(git_default_email + len, sizeof(git_default_email) - len);\n+\tif (!strchr(git_default_email+len, '.')) {\n+\t\tlen = strlen(git_default_email);\n+\t\tgit_default_email[len++] = '.';\n+\t\tgetdomainname(git_default_email+len, sizeof(git_default_email)-len);\n \t}\n \t/* And set the default date */\n-\tdatestamp(real_date, sizeof(real_date));\n+\tdatestamp(git_default_date, sizeof(git_default_date));\n \treturn 0;\n }\n \n@@ -159,10 +157,10 @@ char *get_ident(const char *name, const \n \tint i;\n \n \tif (!name)\n-\t\tname = real_name;\n+\t\tname = git_default_name;\n \tif (!email)\n-\t\temail = real_email;\n-\tstrcpy(date, real_date);\n+\t\temail = git_default_email;\n+\tstrcpy(date, git_default_date);\n \tif (date_str)\n \t\tparse_date(date_str, date, sizeof(date));\n \ndiff --git a/read-cache.c b/read-cache.c\nindex c7f3b26..d2aebdd 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -5,7 +5,6 @@\n  */\n #include \"cache.h\"\n \n-int trust_executable_bit = 1;\n struct cache_entry **active_cache = NULL;\n unsigned int active_nr = 0, active_alloc = 0, active_cache_changed = 0;\n \ndiff --git a/sha1_file.c b/sha1_file.c\nindex 6e3ea23..f059004 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -48,65 +48,6 @@ int get_sha1_hex(const char *hex, unsign\n \treturn 0;\n }\n \n-static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,\n-\t*git_graft_file;\n-static void setup_git_env(void)\n-{\n-\tgit_dir = getenv(GIT_DIR_ENVIRONMENT);\n-\tif (!git_dir)\n-\t\tgit_dir = DEFAULT_GIT_DIR_ENVIRONMENT;\n-\tgit_object_dir = getenv(DB_ENVIRONMENT);\n-\tif (!git_object_dir) {\n-\t\tgit_object_dir = xmalloc(strlen(git_dir) + 9);\n-\t\tsprintf(git_object_dir, \"%s/objects\", git_dir);\n-\t}\n-\tgit_refs_dir = xmalloc(strlen(git_dir) + 6);\n-\tsprintf(git_refs_dir, \"%s/refs\", git_dir);\n-\tgit_index_file = getenv(INDEX_ENVIRONMENT);\n-\tif (!git_index_file) {\n-\t\tgit_index_file = xmalloc(strlen(git_dir) + 7);\n-\t\tsprintf(git_index_file, \"%s/index\", git_dir);\n-\t}\n-\tgit_graft_file = getenv(GRAFT_ENVIRONMENT);\n-\tif (!git_graft_file)\n-\t\tgit_graft_file = strdup(git_path(\"info/grafts\"));\n-}\n-\n-char *get_git_dir(void)\n-{\n-\tif (!git_dir)\n-\t\tsetup_git_env();\n-\treturn git_dir;\n-}\n-\n-char *get_object_directory(void)\n-{\n-\tif (!git_object_dir)\n-\t\tsetup_git_env();\n-\treturn git_object_dir;\n-}\n-\n-char *get_refs_directory(void)\n-{\n-\tif (!git_refs_dir)\n-\t\tsetup_git_env();\n-\treturn git_refs_dir;\n-}\n-\n-char *get_index_file(void)\n-{\n-\tif (!git_index_file)\n-\t\tsetup_git_env();\n-\treturn git_index_file;\n-}\n-\n-char *get_graft_file(void)\n-{\n-\tif (!git_graft_file)\n-\t\tsetup_git_env();\n-\treturn git_graft_file;\n-}\n-\n int safe_create_leading_directories(char *path)\n {\n \tchar *pos = path;\ndiff --git a/var.c b/var.c\nindex 3f13126..51cf86a 100644\n--- a/var.c\n+++ b/var.c\n@@ -42,6 +42,15 @@ static const char *read_var(const char *\n \treturn val;\n }\n \n+static int show_config(const char *var, const char *value)\n+{\n+\tif (value)\n+\t\tprintf(\"%s=%s\\n\", var, value);\n+\telse\n+\t\tprintf(\"%s\\n\", var);\n+\treturn git_default_config(var, value);\n+}\n+\n int main(int argc, char **argv)\n {\n \tconst char *val;\n@@ -52,9 +61,11 @@ int main(int argc, char **argv)\n \tval = NULL;\n \n \tif (strcmp(argv[1], \"-l\") == 0) {\n+\t\tgit_config(show_config);\n \t\tlist_vars();\n \t\treturn 0;\n \t}\n+\tgit_config(git_default_config);\n \tval = read_var(argv[1]);\n \tif (!val)\n \t\tusage(var_usage);\n"}]}