Merge branch 'ns/tmp-objdir' into en/remerge-diff

[thirdparty/git.git] / environment.c

diff --git a/environment.c b/environment.c
index d797f173b0d7a89ce6b61bf89a234b4a9827cbb2..fd0501e77a5b8d96dad8b5fe3714b74f13786be7 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -32,7 +32,6 @@ int prefer_symlink_refs;
 int is_bare_repository_cfg = -1; /* unspecified */
 int warn_ambiguous_refs = 1;
 int warn_on_object_refname_ambiguity = 1;
-int ref_paranoia = -1;
 int repository_format_precious_objects;
 int repository_format_worktree_config;
 const char *git_commit_encoding;
@@ -44,6 +43,7 @@ const char *git_hooks_path;
 int zlib_compression_level = Z_BEST_SPEED;
 int pack_compression_level = Z_DEFAULT_COMPRESSION;
 int fsync_object_files;
+int use_fsync = -1;
 size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 96 * 1024 * 1024;
@@ -96,13 +96,6 @@ int auto_comment_line_char;
 /* Parallel index stat data preload? */
 int core_preload_index = 1;
 
-/*
- * This is a hack for test programs like test-dump-untracked-cache to
- * ensure that they do not modify the untracked cache when reading it.
- * Do not use it otherwise!
- */
-int ignore_untracked_cache_config;
-
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;
 
@@ -334,8 +327,7 @@ char *get_graft_file(struct repository *r)
 
 static void set_git_dir_1(const char *path)
 {
-       if (setenv(GIT_DIR_ENVIRONMENT, path, 1))
-               die(_("could not set GIT_DIR to '%s'"), path);
+       xsetenv(GIT_DIR_ENVIRONMENT, path, 1);
        setup_git_env(path);
 }