X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=2228c4e9a14ed6b1b936c838b52f66909429d9d2;hb=909ca7b9ac11711478aaa5dd4ab17a0d1dabe075;hp=40185bc854ea2c5b8d2e3deb800dd6f3f44482a9;hpb=d9ac3e41c37ea565d8227d942b4f468616c9813a;p=git.git

diff --git a/environment.c b/environment.c
index 40185bc85..2228c4e9a 100644
--- a/environment.c
+++ b/environment.c
@@ -42,8 +42,8 @@ const char *editor_program;
 const char *askpass_program;
 const char *excludes_file;
 enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
-int read_replace_refs = 1;
-enum eol eol = EOL_UNSET;
+int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
+enum eol core_eol = EOL_UNSET;
 enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
@@ -91,7 +91,7 @@ static void setup_git_env(void)
 	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	git_dir = git_dir ? xstrdup(git_dir) : NULL;
 	if (!git_dir) {
-		git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+		git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);
 		git_dir = git_dir ? xstrdup(git_dir) : NULL;
 	}
 	if (!git_dir)