Merge branch 'ls/travis-submitting-patches' into HEAD

diff --git a/environment.c b/environment.c
index d9e3861fe8f1f93cf2b34235dd9eaf9d8bd8847a..57acb2fe2aee79a30c4c956dcececd6a7122aeb6 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -62,7 +62,6 @@ 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;
 
 #ifndef PROTECT_HFS_DEFAULT