Merge branch 'jk/prune-with-corrupt-refs'

"git prune" used to largely ignore broken refs when deciding which
objects are still being used, which could spread an existing small
damage and make it a larger one.

* jk/prune-with-corrupt-refs:
  refs.c: drop curate_packed_refs
  repack: turn on "ref paranoia" when doing a destructive repack
  prune: turn on ref_paranoia flag
  refs: introduce a "ref paranoia" flag
  t5312: test object deletion code paths in a corrupted repository
This commit is contained in:
Junio C Hamano
2015-03-25 12:54:26 -07:00
7 changed files with 147 additions and 68 deletions

View File

@ -613,6 +613,14 @@ extern int precomposed_unicode;
extern int protect_hfs;
extern int protect_ntfs;
/*
* Include broken refs in all ref iterations, which will
* generally choke dangerous operations rather than letting
* them silently proceed without taking the broken ref into
* account.
*/
extern int ref_paranoia;
/*
* The character that begins a commented line in user-editable file
* that is subject to stripspace.