git-read-tree: make one-way merge also honor the "update" flag

diff --git a/cache.h b/cache.h
index 95353a10a37d06bcc5d31f4d91cbb35f367b7c1a..74307f18296a6ef00f1839cc62d7560db1b916d6 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -117,6 +117,7 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
 
 extern char *get_object_directory(void);
+extern char *get_refs_directory(void);
 extern char *get_index_file(void);
 
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"