Merge branch 'pn/commit-autosquash'

diff --git a/environment.c b/environment.c
index a9d44a28a75cbba39e04561e5ea3ae4f1b9f51d3..76e4dee273340e01855ffbce355741ed5d369009 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -21,6 +21,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 unique_abbrev_extra_length;
 int repository_format_version;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;