pack-objects: do not accept "--index-version=version,"
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Feb 1, 2012 at 22:17 UTC
6a301345a545ce5faf1a054d6c9bf1558dd46b0d
2 files changed
+5
-1
builtin/pack-objects.c
+1
-1
@@ -2471,7 +2471,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2471
pack_idx_opts.version = strtoul(arg + 16, &c, 10);
2472
if (pack_idx_opts.version > 2)
2473
die("bad %s", arg);
2474
- if (*c == ',')
2474
+ if (*c == ',' && c[1])
2475
pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2476
if (*c || pack_idx_opts.off32_limit & 0x80000000)
2477
die("bad %s", arg);
t/t5302-pack-index.sh
+4
@@ -73,6 +73,10 @@ test_expect_success 'index-pack --verify on index version 2' '
73
git index-pack --verify "test-2-${pack2}.pack"
74
'
75
76
+test_expect_success \
77
+ 'pack-objects --index-version=2, is not accepted' \
78
+ 'test_must_fail git pack-objects --index-version=2, test-3 <obj-list'
79
+
80
test_expect_success \
81
'index v2: force some 64-bit offsets with pack-objects' \
82
'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)'