Merge branch 'jc/index-pack-reject-dups'

* jc/index-pack-reject-dups: receive-pack, fetch-pack: reject bogus pack that records objects twice
2011-12-05 15:13:42 -08:00
parent cd17abdf75 68be2fea50
commit 33fba9c64e
4 changed files with 11 additions and 2 deletions
--- a/pack.h
+++ b/pack.h
@ -37,7 +37,8 @@ struct pack_header {
 struct pack_idx_option {
 	unsigned flags;
 	/* flag bits */
-#define WRITE_IDX_VERIFY 01
+#define WRITE_IDX_VERIFY 01 /* verify only, do not write the idx file */
+#define WRITE_IDX_STRICT 02

 	uint32_t version;
 	uint32_t off32_limit;