X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=22316597df60648c850001e068938eaf39d57f6d;hb=957d6ea78fcbe71481a6f46a58768e100f7908e0;hp=54c22f8248cc04647829c8a7558f2bb24515f30f;hpb=4a164d48df6bb1b4a771741c63d4437fd2dca0bb;p=git.git

diff --git a/environment.c b/environment.c
index 54c22f824..22316597d 100644
--- a/environment.c
+++ b/environment.c
@@ -13,21 +13,24 @@ char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int use_legacy_headers = 1;
 int trust_executable_bit = 1;
+int has_symlinks = 1;
 int assume_unchanged;
 int prefer_symlink_refs;
 int is_bare_repository_cfg = -1; /* unspecified */
 int log_all_ref_updates = -1; /* unspecified */
 int warn_ambiguous_refs = 1;
 int repository_format_version;
-char *git_commit_encoding;
-char *git_log_output_encoding;
+const char *git_commit_encoding;
+const char *git_log_output_encoding;
 int shared_repository = PERM_UMASK;
 const char *apply_default_whitespace;
 int zlib_compression_level = Z_DEFAULT_COMPRESSION;
 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 = 16 * 1024 * 1024;
 int pager_in_use;
 int pager_use_color = 1;
+int auto_crlf = 0;	/* 1: both ways, -1: only when adding git objects */
 
 static const char *git_dir;
 static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;