Merge branch 'maint-1.6.0' into maint

gitster · gitster · commit 9b27ea95189b · 2009-02-10T15:32:26.000-08:00
* maint-1.6.0:
  Clear the delta base cache during fast-import checkpoint
diff --git a/cache.h b/cache.h
@@ -825,6 +825,7 @@ extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t
 extern void close_pack_windows(struct packed_git *);
 extern void unuse_pack(struct pack_window **);
 extern void free_pack_by_name(const char *);
+extern void clear_delta_base_cache(void);
 extern struct packed_git *add_packed_git(const char *, int, int);
 extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t);
 extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t);
diff --git a/fast-import.c b/fast-import.c
@@ -944,6 +944,7 @@ static void end_packfile(void)
 {
 	struct packed_git *old_p = pack_data, *new_p;
 
+	clear_delta_base_cache();
 	if (object_count) {
 		char *idx_name;
 		int i;
diff --git a/sha1_file.c b/sha1_file.c
@@ -1663,6 +1663,13 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
 	}
 }
 
+void clear_delta_base_cache(void)
+{
+	unsigned long p;
+	for (p = 0; p < MAX_DELTA_CACHE; p++)
+		release_delta_base_cache(&delta_base_cache[p]);
+}
+
 static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 	void *base, unsigned long base_size, enum object_type type)
 {

Original file line number	Diff line number	Diff line change
`@@ -944,6 +944,7 @@ static void end_packfile(void)`
`944`	`944`	`{`
`945`	`945`	`struct packed_git old_p = pack_data, new_p;`
`946`	`946`
	`947`	`+ clear_delta_base_cache();`
`947`	`948`	`if (object_count) {`
`948`	`949`	`char *idx_name;`
`949`	`950`	`int i;`
Original file line number	Diff line number	Diff line change
`@@ -1663,6 +1663,13 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)`
`1663`	`1663`	`}`
`1664`	`1664`	`}`
`1665`	`1665`
	`1666`	`+void clear_delta_base_cache(void)`
	`1667`	`+{`
	`1668`	`+ unsigned long p;`
	`1669`	`+ for (p = 0; p < MAX_DELTA_CACHE; p++)`
	`1670`	`+ release_delta_base_cache(&delta_base_cache[p]);`
	`1671`	`+}`
	`1672`	`+`
`1666`	`1673`	`static void add_delta_base_cache(struct packed_git *p, off_t base_offset,`
`1667`	`1674`	`void *base, unsigned long base_size, enum object_type type)`
`1668`	`1675`	`{`