diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:03:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:03:36 -0800 |
| commit | 68f80f549092bcbb2409ba9c0eace73c085ba7cc (patch) | |
| tree | cfa6bb8d0528b9fb4bc70e1f28ac178a89b28812 /builtin | |
| parent | Merge branch 'mf/curl-select-fdset' into maint (diff) | |
| parent | receive-pack, fetch-pack: reject bogus pack that records objects twice (diff) | |
| download | tgif-68f80f549092bcbb2409ba9c0eace73c085ba7cc.tar.xz | |
Merge branch 'jc/index-pack-reject-dups' into maint
* jc/index-pack-reject-dups:
receive-pack, fetch-pack: reject bogus pack that records objects twice
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 0945adbb3b..98025da767 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1122,8 +1122,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (!index_name) die("--verify with no packfile name given"); read_idx_option(&opts, index_name); - opts.flags |= WRITE_IDX_VERIFY; + opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT; } + if (strict) + opts.flags |= WRITE_IDX_STRICT; curr_pack = open_pack_file(pack_name); parse_pack_header(); |