First batch for 2.5 cycle

diff --git a/environment.c b/environment.c
index 1ade5c9684a9f901db7d0b3fff04d0cad443caf7..a40044c3bf8040a36ddfb5c260b389ec63683abd 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -24,6 +24,7 @@ int is_bare_repository_cfg = -1; /* unspecified */
 int log_all_ref_updates = -1; /* unspecified */
 int warn_ambiguous_refs = 1;
 int warn_on_object_refname_ambiguity = 1;
+int ref_paranoia = -1;
 int repository_format_version;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;