Retire support for old environment variables.

We have deprecated the old environment variable names for quite a
while and now it's time to remove them.  Gone are:

    SHA1_FILE_DIRECTORIES AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME
    COMMIT_AUTHOR_EMAIL COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY

Signed-off-by: Junio C Hamano <junkio@cox.net>

Makefile

@@ -124,7 +124,7 @@ DIFF_OBJS = \
 
 LIB_OBJS = \
 	blob.o commit.o connect.o count-delta.o csum-file.o \
-	date.o diff-delta.o entry.o gitenv.o ident.o index.o \
+	date.o diff-delta.o entry.o ident.o index.o \
 	object.o pack-check.o patch-delta.o path.o pkt-line.o \
 	quote.o read-cache.o refs.o rev-cache.o run-command.o \
 	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \

cache.h

@@ -53,17 +53,6 @@
  */
 #define DEFAULT_GIT_PORT 9418
 
-/*
- * Environment variables transition.
- * We accept older names for now but warn.
- */
-extern char *gitenv_bc(const char *);
-#ifdef __GNUC__
-#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
-#else
-#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
-#endif
-
 /*
  * Basic data structures for the directory cache
  */

diff.c

@@ -32,10 +32,10 @@ static const char *external_diff(void)
 	 *
 	 * GIT_DIFF_OPTS="-c";
 	 */
-	external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF");
+	external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
 
 	/* In case external diff fails... */
-	env_diff_opts = gitenv("GIT_DIFF_OPTS");
+	env_diff_opts = getenv("GIT_DIFF_OPTS");
 	if (env_diff_opts) diff_opts = env_diff_opts;
 
 	done_preparing = 1;

fsck-objects.c

@@ -392,7 +392,7 @@ static int fsck_head_link(void)
 	static char path[PATH_MAX], link[PATH_MAX];
 	const char *git_dir;
 
-	git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 
 	snprintf(path, sizeof(path), "%s/HEAD", git_dir);

http-fetch.c

@@ -355,7 +355,7 @@ int main(int argc, char **argv)
 
 	curl = curl_easy_init();
 
-	curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
+	curl_ssl_verify = getenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify);
 #if LIBCURL_VERSION_NUM >= 0x070907
 	curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);

ident.c

@@ -150,10 +150,10 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 
 char *git_author_info(void)
 {
-	return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE"));
+	return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
 }
 
 char *git_committer_info(void)
 {
-	return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE"));
+	return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
 }

init-db.c

@@ -226,7 +226,7 @@ int main(int argc, char **argv)
 	/*
 	 * Set up the default .git directory contents
 	 */
-	git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir) {
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 		fprintf(stderr, "defaulting to local storage area\n");

path.c

@@ -45,7 +45,7 @@ char *git_path(const char *fmt, ...)
 	va_list args;
 	unsigned len;
 
-	git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 	len = strlen(git_dir);
 	if (len > PATH_MAX-100)

setup.c

@@ -87,7 +87,7 @@ static int is_toplevel_directory(void)
 	return	!lstat(".git/HEAD", &st) &&
 		S_ISLNK(st.st_mode) &&
 		!access(".git/refs/", X_OK) &&
-		(gitenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
+		(getenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
 }
 
 const char *setup_git_directory(void)
@@ -99,7 +99,7 @@ const char *setup_git_directory(void)
 	 * If GIT_DIR is set explicitly, we're not going
 	 * to do any discovery
 	 */
-	if (gitenv(GIT_DIR_ENVIRONMENT))
+	if (getenv(GIT_DIR_ENVIRONMENT))
 		return NULL;
 
 	if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')

sha1_file.c

@@ -50,22 +50,22 @@ static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
 	*git_graft_file;
 static void setup_git_env(void)
 {
-	git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir)
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
-	git_object_dir = gitenv(DB_ENVIRONMENT);
+	git_object_dir = getenv(DB_ENVIRONMENT);
 	if (!git_object_dir) {
 		git_object_dir = xmalloc(strlen(git_dir) + 9);
 		sprintf(git_object_dir, "%s/objects", git_dir);
 	}
 	git_refs_dir = xmalloc(strlen(git_dir) + 6);
 	sprintf(git_refs_dir, "%s/refs", git_dir);
-	git_index_file = gitenv(INDEX_ENVIRONMENT);
+	git_index_file = getenv(INDEX_ENVIRONMENT);
 	if (!git_index_file) {
 		git_index_file = xmalloc(strlen(git_dir) + 7);
 		sprintf(git_index_file, "%s/index", git_dir);
 	}
-	git_graft_file = gitenv(GRAFT_ENVIRONMENT);
+	git_graft_file = getenv(GRAFT_ENVIRONMENT);
 	if (!git_graft_file)
 		git_graft_file = strdup(git_path("info/grafts"));
 }
@@ -285,7 +285,7 @@ void prepare_alt_odb(void)
 	struct stat st;
 	char *alt;
 
-	alt = gitenv(ALTERNATE_DB_ENVIRONMENT);
+	alt = getenv(ALTERNATE_DB_ENVIRONMENT);
 	if (!alt) alt = "";
 
 	sprintf(path, "%s/info/alternates", get_object_directory());