From: Nguyễn Thái Ngọc Duy Date: Wed, 01 Feb 2012 15:17:18 GMT Subject: [PATCH v2 1/3] pack-objects: do not accept "--index-version=version," Message-ID: <1328109440-9510-1-git-send-email-pclouds@gmail.com> In-Reply-To: <1328017702-14489-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 2 +- 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 0f2e7b8..297f792 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 f8fa924..fe82025 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