Merge branch 'fc/rev-parse-test-updates'

diff --git a/environment.c b/environment.c
index 0cb67b22cf5a8754daf429b3dbe45ef3e663650b..5398c36dd4dc2c1d7ded3f92c217a99a240a0a23 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -22,6 +22,7 @@ int prefer_symlink_refs;
 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 repository_format_version;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;