summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-06 23:48:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-06 23:48:43 (GMT)
commitee267527aa80807f37caf1d00bcf1b5263945adb (patch)
tree4176958cd88ae4187b85f1d6bc4b2dd40cd63f28 /cache.h
parenta02ebff6127c5fc981668fb570f0a80f2b7657ca (diff)
downloadgit-ee267527aa80807f37caf1d00bcf1b5263945adb.zip
git-ee267527aa80807f37caf1d00bcf1b5263945adb.tar.gz
git-ee267527aa80807f37caf1d00bcf1b5263945adb.tar.bz2
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.
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 9de7709..a727cb4 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"