Merge branch 'js/fmt-patch' into next

diff --git a/environment.c b/environment.c
index 0596fc647be37343371ae5a266906dab35707076..444c99ed6efc8e9e1661427e08b44bb8b0e5fbf2 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -12,10 +12,13 @@
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int trust_executable_bit = 1;
-int only_use_symrefs = 0;
+int assume_unchanged = 0;
+int prefer_symlink_refs = 0;
+int warn_ambiguous_refs = 1;
 int repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = 0;
+const char *apply_default_whitespace = NULL;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;