summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2017-12-09 20:40:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-12 00:10:12 (GMT)
commit72885a6d5181ca090039917b6ce76b952ebb59b1 (patch)
treeb95b0a7f87ab9d040b4f2200935651d3fd82bd1a /builtin/index-pack.c
parentafaef55e230c6fcfb4e8a27c1b970f7e6400a7f6 (diff)
downloadgit-72885a6d5181ca090039917b6ce76b952ebb59b1.zip
git-72885a6d5181ca090039917b6ce76b952ebb59b1.tar.gz
git-72885a6d5181ca090039917b6ce76b952ebb59b1.tar.bz2
index-pack: use skip_to_optional_arg()
Let's simplify index-pack option parsing using skip_to_optional_arg(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 8ec459f..4c51aec 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1660,10 +1660,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);
@@ -1679,10 +1676,8 @@ 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 (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
+ ; /* nothing to do */
} else if (starts_with(arg, "--threads=")) {
char *end;
nr_threads = strtoul(arg+10, &end, 0);