Mention that pull can work locally in the synopsis

[git.git] / environment.c

diff --git a/environment.c b/environment.c
index 5fae9ac3056dd00beba3b9a13be99f7bb39d584e..63b1d155be1aca2f9fe7aad5f747c06b9102fd60 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -20,6 +20,7 @@ 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;
@@ -47,7 +48,7 @@ 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"));
 }
 
 const char *get_git_dir(void)