[PATCH v2 07/16] pack-objects: add --version to specify written pack version
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:58:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/pack-objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 33faea8..ef68fc5 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c@@ -81,6 +81,7 @@ static int num_preferred_base; static struct progress *progress_state; static int pack_compression_level = Z_DEFAULT_COMPRESSION; static int pack_compression_seen; +static int pack_version = 2; static unsigned long delta_cache_size = 0; static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
@@ -735,7 +736,7 @@ static void write_pack_file(void) else f = create_tmp_packfile(&pack_tmp_name); - offset = write_pack_header(f, 2, nr_remaining); + offset = write_pack_header(f, pack_version, nr_remaining); if (!offset) die_errno("unable to write pack header"); nr_written = 0;
@@ -2455,6 +2456,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"), N_("write the pack index file in the specified idx format version"), 0, option_parse_index_version }, + OPT_INTEGER(0, "version", &pack_version, N_("pack version")), OPT_ULONG(0, "max-pack-size", &pack_size_limit, N_("maximum size of each output pack file")), OPT_BOOL(0, "local", &local,
@@ -2525,6 +2527,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) } if (pack_to_stdout != !base_name || argc) usage_with_options(pack_usage, pack_objects_options); + if (pack_version != 2) + die(_("pack version %d is not supported"), pack_version); rp_av[rp_ac++] = "pack-objects"; if (thin) {
--
1.8.2.83.gc99314b