summaryrefslogtreecommitdiff
path: root/builtin/index-pack.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 /builtin/index-pack.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 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 0945adb..98025da 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();