Merge in 1.6.5.4

diff --git a/environment.c b/environment.c
index 5946f385f57d4be47c2ab02585a90ba8da723f1f..5171d9f9a4a30054983638e9e19e61f422724373 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -49,6 +49,7 @@ enum push_default_type push_default = PUSH_DEFAULT_MATCHING;
 #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
 #endif
 enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
+char *notes_ref_name;
 int grafts_replace_parents = 1;
 
 /* Parallel index stat data preload? */