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 /pack-write.c | |
| 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 'pack-write.c')
| -rw-r--r-- | pack-write.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pack-write.c b/pack-write.c index 9cd3bfbb4b..f84adde3eb 100644 --- a/pack-write.c +++ b/pack-write.c @@ -129,6 +129,10 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec } sha1write(f, obj->sha1, 20); git_SHA1_Update(&ctx, obj->sha1, 20); + if ((opts->flags & WRITE_IDX_STRICT) && + (i && !hashcmp(list[-2]->sha1, obj->sha1))) + die("The same object %s appears twice in the pack", + sha1_to_hex(obj->sha1)); } if (index_version >= 2) { |