Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maint

diff --git a/environment.c b/environment.c
index 669e498f5a245909725494feda2531f0088f8160..85edd7f95adecd8316b49638d7bda2841839206d 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -58,6 +58,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;