From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Feb 2009 02:47:30 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/30aa4fb15fa408596dea59cdc9f00c94eeaa69f1?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Prepare for 1.6.1.4.
Make repack less likely to corrupt repository
fast-export: ensure we traverse commits in topological order
Clear the delta base cache if a pack is rebuilt

Conflicts:
RelNotes
---

30aa4fb15fa408596dea59cdc9f00c94eeaa69f1
diff --combined sha1_file.c
index 7459a9cd82,b63f842cbd..5b6e0f61fa
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -689,6 -689,7 +689,7 @@@ void free_pack_by_name(const char *pack
  	while (*pp) {
  		p = *pp;
  		if (strcmp(pack_name, p->pack_name) == 0) {
+ 			clear_delta_base_cache();
  			close_pack_windows(p);
  			if (p->pack_fd != -1)
  				close(p->pack_fd);
@@@ -1707,9 -1708,6 +1708,9 @@@ static void add_delta_base_cache(struc
  	delta_base_cache_lru.prev = &ent->lru;
  }
  
 +static void *read_object(const unsigned char *sha1, enum object_type *type,
 +			 unsigned long *size);
 +
  static void *unpack_delta_entry(struct packed_git *p,
  				struct pack_window **w_curs,
  				off_t curpos,
@@@ -2140,8 -2138,8 +2141,8 @@@ int pretend_sha1_file(void *buf, unsign
  	return 0;
  }
  
 -void *read_object(const unsigned char *sha1, enum object_type *type,
 -		  unsigned long *size)
 +static void *read_object(const unsigned char *sha1, enum object_type *type,
 +			 unsigned long *size)
  {
  	unsigned long mapsize;
  	void *map, *buf;