summaryrefslogtreecommitdiff
path: root/pack.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:13:42 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:13:42 -0800
commit33fba9c64e305c64b4d6f4c31f02c1dd7e8fbfa8 (patch)
tree75858cfa2826a36fc8904dccae081df569b8477d /pack.h
parentcd17abdf75207e01bb716c2c7c9f62e56f2f0fdb (diff)
parent68be2fea50e7a34c0e5f9fdf6adb9040c8df197f (diff)
downloadgit-33fba9c64e305c64b4d6f4c31f02c1dd7e8fbfa8.tar.gz
Merge branch 'jc/index-pack-reject-dups'
* jc/index-pack-reject-dups: receive-pack, fetch-pack: reject bogus pack that records objects twice
Diffstat (limited to 'pack.h')
-rw-r--r--pack.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/pack.h b/pack.h
index 324a1d73c0..a8d9b9f2fc 100644
--- 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;