undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: do not accept "--index-version=version,"

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-02-01 22:17:18 +07:00 committed by Junio C Hamano
parent 828ea97de4
commit 6a301345a5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

@ -2471,7 +2471,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
pack_idx_opts.version = strtoul(arg + 16, &c, 10); pack_idx_opts.version = strtoul(arg + 16, &c, 10);
if (pack_idx_opts.version > 2) if (pack_idx_opts.version > 2)
die("bad %s", arg); die("bad %s", arg);
if (*c == ',') if (*c == ',' && c[1])
pack_idx_opts.off32_limit = strtoul(c+1, &c, 0); pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
if (*c || pack_idx_opts.off32_limit & 0x80000000) if (*c || pack_idx_opts.off32_limit & 0x80000000)
die("bad %s", arg); die("bad %s", arg);

4
t/t5302-pack-index.sh
View File

@ -73,6 +73,10 @@ test_expect_success 'index-pack --verify on index version 2' '
git index-pack --verify "test-2-${pack2}.pack" git index-pack --verify "test-2-${pack2}.pack"
' '
test_expect_success \
'pack-objects --index-version=2, is not accepted' \
'test_must_fail git pack-objects --index-version=2, test-3 <obj-list'
test_expect_success \ test_expect_success \
'index v2: force some 64-bit offsets with pack-objects' \ 'index v2: force some 64-bit offsets with pack-objects' \
'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)' 'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)'