@matheusbsbs / matheus-bagliano / commits / b861e235bc

repack: propagate pack-objects options as strings

In the original shell version of git-repack, any options destined for pack-objects were left as strings, and passed as a whole. Since the C rewrite in commit a1bbc6c (repack: rewrite the shell script in C, 2013-09-15), we now parse these values to integers internally, then reformat the integers when passing the option to pack-objects. This has the advantage that we catch format errors earlier (i.e., when repack is invoked, rather than when pack-objects is invoked). It has three disadvantages, though: 1. Our internal data types may not be the right size. In the case of "--window-memory" and "--max-pack-size", these are "unsigned long" in pack-objects, but we can only represent a regular "int". 2. Our parsing routines might not be the same as those of pack-objects. For the two options above, pack-objects understands "100m" to mean "100 megabytes", but repack does not. 3. We have to keep a sentinel value to know whether it is worth passing the option along. In the case of "--window-memory", we currently do not pass it if the value is "0". But that is a meaningful value to pack-objects, where it overrides any configured value. We can fix all of these by simply passing the strings from the user along to pack-objects verbatim. This does not actually fix anything for "--depth" or "--window", but these are converted, too, for consistency. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 22, 2014 at 20:30 UTC b861e235bc68e1c085e48d029579afbeeeec995c

1 file changed +11 -11

builtin/repack.c

+11 -11

@@ -130,9 +130,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

130 int pack_everything = 0;

131 int delete_redundant = 0;

132 const char *unpack_unreachable = NULL;

133 - int window = 0, window_memory = 0;

134 - int depth = 0;

135 - int max_pack_size = 0;

133 + const char *window = NULL, *window_memory = NULL;

134 + const char *depth = NULL;

135 + const char *max_pack_size = NULL;

136 int no_reuse_delta = 0, no_reuse_object = 0;

137 int no_update_server_info = 0;

138 int quiet = 0;

@@ -157,13 +157,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

157 N_("pass --local to git-pack-objects")),

158 OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),

159 N_("with -A, do not loosen objects older than this")),

160 - OPT_INTEGER(0, "window", &window,

160 + OPT_STRING(0, "window", &window, N_("n"),

161 N_("size of the window used for delta compression")),

162 - OPT_INTEGER(0, "window-memory", &window_memory,

162 + OPT_STRING(0, "window-memory", &window_memory, N_("bytes"),

163 N_("same as the above, but limit memory size instead of entries count")),

164 - OPT_INTEGER(0, "depth", &depth,

164 + OPT_STRING(0, "depth", &depth, N_("n"),

165 N_("limits the maximum delta depth")),

166 - OPT_INTEGER(0, "max-pack-size", &max_pack_size,

166 + OPT_STRING(0, "max-pack-size", &max_pack_size, N_("bytes"),

167 N_("maximum size of each packfile")),

168 OPT_END()

169 };

@@ -185,13 +185,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

185 argv_array_push(&cmd_args, "--all");

186 argv_array_push(&cmd_args, "--reflog");

187 if (window)

188 - argv_array_pushf(&cmd_args, "--window=%u", window);

188 + argv_array_pushf(&cmd_args, "--window=%s", window);

189 if (window_memory)

190 - argv_array_pushf(&cmd_args, "--window-memory=%u", window_memory);

190 + argv_array_pushf(&cmd_args, "--window-memory=%s", window_memory);

191 if (depth)

192 - argv_array_pushf(&cmd_args, "--depth=%u", depth);

192 + argv_array_pushf(&cmd_args, "--depth=%s", depth);

193 if (max_pack_size)

194 - argv_array_pushf(&cmd_args, "--max-pack-size=%u", max_pack_size);

194 + argv_array_pushf(&cmd_args, "--max-pack-size=%s", max_pack_size);

195 if (no_reuse_delta)

196 argv_array_pushf(&cmd_args, "--no-reuse-delta");

197 if (no_reuse_object)