merge-recur: fix thinko in unique_path()

diff --git a/environment.c b/environment.c
index 73e4b1c8b7a97e5c176b51a7ce1f7d4ee802f86b..97d42b172be5abbada30da97893c77e67a0bcde0 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -12,11 +12,16 @@
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int trust_executable_bit = 1;
-int only_use_symrefs = 0;
+int assume_unchanged = 0;
+int prefer_symlink_refs = 0;
+int log_all_ref_updates = 0;
+int warn_ambiguous_refs = 1;
 int repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
-int shared_repository = 0;
+int shared_repository = PERM_UMASK;
 const char *apply_default_whitespace = NULL;
+int zlib_compression_level = Z_DEFAULT_COMPRESSION;
+int pager_in_use;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;