Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state

diff --git a/environment.c b/environment.c
index 669e498f5a245909725494feda2531f0088f8160..e828b371f58d5e4cd0a24b3b3b24b35b785edeba 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -13,6 +13,7 @@
 
 int trust_executable_bit = 1;
 int trust_ctime = 1;
+int check_stat = 1;
 int has_symlinks = 1;
 int minimum_abbrev = 4, default_abbrev = 7;
 int ignore_case;
@@ -58,6 +59,7 @@ char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;
 int merge_log_config = -1;
+int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 struct startup_info *startup_info;
 unsigned long pack_size_limit_cfg;