fetch-pack: use skip_prefix() instead of starts_with()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 9b2a514e1d787784c2fac8d844d58013b6091aa6..8332d3d5209e0f3b8671a5adb7947f0a431ec8e1 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -59,12 +59,12 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
        for (i = 1; i < argc && *argv[i] == '-'; i++) {
                const char *arg = argv[i];
 
        for (i = 1; i < argc && *argv[i] == '-'; i++) {
                const char *arg = argv[i];
 

-               if (starts_with(arg, "--upload-pack=")) {
-                       args.uploadpack = arg + 14;
+               if (skip_prefix(arg, "--upload-pack=", &arg)) {
+                       args.uploadpack = arg;

                        continue;
                }
                        continue;
                }

-               if (starts_with(arg, "--exec=")) {
-                       args.uploadpack = arg + 7;
+               if (skip_prefix(arg, "--exec=", &arg)) {
+                       args.uploadpack = arg;

                        continue;
                }
                if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {
                        continue;
                }
                if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {


@@ -100,8 +100,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
                        args.verbose = 1;
                        continue;
                }
                        args.verbose = 1;
                        continue;
                }

-               if (starts_with(arg, "--depth=")) {
-                       args.depth = strtol(arg + 8, NULL, 0);
+               if (skip_prefix(arg, "--depth=", &arg)) {
+                       args.depth = strtol(arg, NULL, 0);

                        continue;
                }
                if (!strcmp("--no-progress", arg)) {
                        continue;
                }
                if (!strcmp("--no-progress", arg)) {