From ee267527aa80807f37caf1d00bcf1b5263945adb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 6 May 2005 16:48:43 -0700 Subject: Revert bogus optimization that avoids index file writes It didn't properly mark all cache updates as being dirty, and causes merge errors due to that. In particular, it didn't notice when a file was force-removed. Besides, it was ugly as hell. I've put in place a slightly cleaner version, but I've not enabled the optimization because I don't want to be burned again. --- cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index 9de7709f9..a727cb4ef 100644 --- a/cache.h +++ b/cache.h @@ -98,7 +98,7 @@ static inline unsigned int create_ce_mode(unsigned int mode) const char *sha1_file_directory; struct cache_entry **active_cache; -unsigned int active_nr, active_alloc; +unsigned int active_nr, active_alloc, active_cache_changed; #define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY" #define DEFAULT_DB_ENVIRONMENT ".git/objects" -- cgit v1.2.1