Merge branch 'jh/fsck-promisors'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a0a35e69c0a044fa40a2481c22ef56a766b23e41..5ebd370c56d2611494868ad1cf5957b5e9ea636e 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1682,10 +1682,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                from_stdin = 1;
                        } else if (!strcmp(arg, "--fix-thin")) {
                                fix_thin_pack = 1;
-                       } else if (!strcmp(arg, "--strict")) {
-                               strict = 1;
-                               do_fsck_object = 1;
-                       } else if (skip_prefix(arg, "--strict=", &arg)) {
+                       } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
                                strict = 1;
                                do_fsck_object = 1;
                                fsck_set_msg_types(&fsck_options, arg);
@@ -1701,14 +1698,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                                verify = 1;
                                show_stat = 1;
                                stat_only = 1;
-                       } else if (!strcmp(arg, "--keep")) {
-                               keep_msg = "";
-                       } else if (starts_with(arg, "--keep=")) {
-                               keep_msg = arg + 7;
-                       } else if (!strcmp(arg, "--promisor")) {
-                               promisor_msg = "";
-                       } else if (starts_with(arg, "--promisor=")) {
-                               promisor_msg = arg + strlen("--promisor=");
+                       } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
+                               ; /* nothing to do */
+                       } else if (skip_to_optional_arg(arg, "--promisor", &promisor_msg)) {
+                               ; /* already parsed */
                        } else if (starts_with(arg, "--threads=")) {
                                char *end;
                                nr_threads = strtoul(arg+10, &end, 0);