diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-02-01 22:17:18 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-01 13:03:46 -0800 |
| commit | 6a301345a545ce5faf1a054d6c9bf1558dd46b0d (patch) | |
| tree | f1d6dd8f936d5a9c6c10745156a2f9185a8aa295 | |
| parent | 828ea97de486c1693d6e4f2c7347acb50235a85d (diff) | |
| download | git-6a301345a545ce5faf1a054d6c9bf1558dd46b0d.tar.gz | |
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>
| -rw-r--r-- | builtin/pack-objects.c | 2 | ||||
| -rwxr-xr-x | t/t5302-pack-index.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 0f2e7b8f5c..297f792851 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -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); if (pack_idx_opts.version > 2) die("bad %s", arg); - if (*c == ',') + if (*c == ',' && c[1]) pack_idx_opts.off32_limit = strtoul(c+1, &c, 0); if (*c || pack_idx_opts.off32_limit & 0x80000000) die("bad %s", arg); diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index f8fa92446c..fe82025d4a 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -74,6 +74,10 @@ test_expect_success 'index-pack --verify on index version 2' ' ' 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 \ 'index v2: force some 64-bit offsets with pack-objects' \ 'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)' |