Merge branch 'maint'

* maint:
  Start 1.6.0.5 cycle
  Fix pack.packSizeLimit and --max-pack-size handling
  checkout: Fix "initial checkout" detection
  Remove the period after the git-check-attr summary

Conflicts:
	RelNotes
This commit is contained in:
Junio C Hamano
2008-11-12 15:03:57 -08:00
8 changed files with 47 additions and 6 deletions

View File

@ -1269,6 +1269,11 @@ unmap:
die("index file corrupt");
}
int is_index_unborn(struct index_state *istate)
{
return (!istate->cache_nr && !istate->alloc && !istate->timestamp);
}
int discard_index(struct index_state *istate)
{
istate->cache_nr = 0;