X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=63b1d155be1aca2f9fe7aad5f747c06b9102fd60;hb=1974bf620b436b014bfe86179ff76485610a4887;hp=e6bd0033b4666f52dc756b6e2b0d5a1745b0c6b9;hpb=2ad6ba353aa3815894674a0dee56aa75f8a5fc7b;p=git.git

diff --git a/environment.c b/environment.c
index e6bd0033b..63b1d155b 100644
--- a/environment.c
+++ b/environment.c
@@ -20,13 +20,15 @@ int warn_ambiguous_refs = 1;
 int repository_format_version;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = PERM_UMASK;
+int deny_non_fast_forwards = 0;
 const char *apply_default_whitespace;
 int zlib_compression_level = Z_DEFAULT_COMPRESSION;
 int pager_in_use;
 int pager_use_color = 1;
 
-static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
-	*git_graft_file;
+static const char *git_dir;
+static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
+
 static void setup_git_env(void)
 {
 	git_dir = getenv(GIT_DIR_ENVIRONMENT);
@@ -46,10 +48,10 @@ static void setup_git_env(void)
 	}
 	git_graft_file = getenv(GRAFT_ENVIRONMENT);
 	if (!git_graft_file)
-		git_graft_file = strdup(git_path("info/grafts"));
+		git_graft_file = xstrdup(git_path("info/grafts"));
 }
 
-char *get_git_dir(void)
+const char *get_git_dir(void)
 {
 	if (!git_dir)
 		setup_git_env();