summaryrefslogtreecommitdiff
path: root/pack-write.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-17 06:04:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-17 06:05:21 (GMT)
commit68be2fea50e7a34c0e5f9fdf6adb9040c8df197f (patch)
treef85e2d46ed7d10a13722934e96baa94f591c93b0 /pack-write.c
parent6f62cd7ab1c47a7ea32ab05cf1292d82c47310e9 (diff)
downloadgit-68be2fea50e7a34c0e5f9fdf6adb9040c8df197f.zip
git-68be2fea50e7a34c0e5f9fdf6adb9040c8df197f.tar.gz
git-68be2fea50e7a34c0e5f9fdf6adb9040c8df197f.tar.bz2
receive-pack, fetch-pack: reject bogus pack that records objects twice
When receive-pack & fetch-pack are run and store the pack obtained over the wire to a local repository, they internally run the index-pack command with the --strict option. Make sure that we reject incoming packfile that records objects twice to avoid spreading such a damage. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-write.c')
-rw-r--r--pack-write.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/pack-write.c b/pack-write.c
index 9cd3bfb..f84adde 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) {