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

diff --git a/upload-pack.c b/upload-pack.c
index 97ed62002ec0b394d251cb07089c34396eaded66..fa7ce092e77035974596b0879002bb093b300679 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -276,7 +276,7 @@ static void create_pack_file(void)
        die("git upload-pack: %s", abort_msg);
 }
 
-static int got_sha1(char *hex, unsigned char *sha1)
+static int got_sha1(const char *hex, unsigned char *sha1)
 {
        struct object *o;
        int we_knew_they_have = 0;
@@ -382,6 +382,8 @@ static int get_common_commits(void)
 
        for (;;) {
                char *line = packet_read_line(0, NULL);
+               const char *arg;
+
                reset_timeout();
 
                if (!line) {
@@ -403,8 +405,8 @@ static int get_common_commits(void)
                        got_other = 0;
                        continue;
                }
-               if (starts_with(line, "have ")) {
-                       switch (got_sha1(line+5, sha1)) {
+               if (skip_prefix(line, "have ", &arg)) {
+                       switch (got_sha1(arg, sha1)) {
                        case -1: /* they have what we do not */
                                got_other = 1;
                                if (multi_ack && ok_to_give_up()) {
@@ -538,19 +540,8 @@ static void check_non_tip(void)
        }
 }
 
-static void deepen(int depth, const struct object_array *shallows)
+static void send_shallow(struct commit_list *result)
 {
-       struct commit_list *result = NULL, *backup = NULL;
-       int i;
-       if (depth == INFINITE_DEPTH && !is_repository_shallow())
-               for (i = 0; i < shallows->nr; i++) {
-                       struct object *object = shallows->objects[i].item;
-                       object->flags |= NOT_SHALLOW;
-               }
-       else
-               backup = result =
-                       get_shallow_commits(&want_obj, depth,
-                                           SHALLOW, NOT_SHALLOW);
        while (result) {
                struct object *object = &result->item->object;
                if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
@@ -561,7 +552,12 @@ static void deepen(int depth, const struct object_array *shallows)
                }
                result = result->next;
        }
-       free_commit_list(backup);
+}
+
+static void send_unshallow(const struct object_array *shallows)
+{
+       int i;
+
        for (i = 0; i < shallows->nr; i++) {
                struct object *object = shallows->objects[i].item;
                if (object->flags & NOT_SHALLOW) {
@@ -569,7 +565,13 @@ static void deepen(int depth, const struct object_array *shallows)
                        packet_write(1, "unshallow %s",
                                     oid_to_hex(&object->oid));
                        object->flags &= ~CLIENT_SHALLOW;
-                       /* make sure the real parents are parsed */
+                       /*
+                        * We want to _register_ "object" as shallow, but we
+                        * also need to traverse object's parents to deepen a
+                        * shallow clone. Unregister it for now so we can
+                        * parse and add the parents to the want list, then
+                        * re-register it.
+                        */
                        unregister_shallow(object->oid.hash);
                        object->parsed = 0;
                        parse_commit_or_die((struct commit *)object);
@@ -584,6 +586,27 @@ static void deepen(int depth, const struct object_array *shallows)
                /* make sure commit traversal conforms to client */
                register_shallow(object->oid.hash);
        }
+}
+
+static void deepen(int depth, const struct object_array *shallows)
+{
+       if (depth == INFINITE_DEPTH && !is_repository_shallow()) {
+               int i;
+
+               for (i = 0; i < shallows->nr; i++) {
+                       struct object *object = shallows->objects[i].item;
+                       object->flags |= NOT_SHALLOW;
+               }
+       } else {
+               struct commit_list *result;
+
+               result = get_shallow_commits(&want_obj, depth,
+                                            SHALLOW, NOT_SHALLOW);
+               send_shallow(result);
+               free_commit_list(result);
+       }
+
+       send_unshallow(shallows);
        packet_flush(1);
 }
 
@@ -599,14 +622,16 @@ static void receive_needs(void)
                const char *features;
                unsigned char sha1_buf[20];
                char *line = packet_read_line(0, NULL);
+               const char *arg;
+
                reset_timeout();
                if (!line)
                        break;
 
-               if (starts_with(line, "shallow ")) {
+               if (skip_prefix(line, "shallow ", &arg)) {
                        unsigned char sha1[20];
                        struct object *object;
-                       if (get_sha1_hex(line + 8, sha1))
+                       if (get_sha1_hex(arg, sha1))
                                die("invalid shallow line: %s", line);
                        object = parse_object(sha1);
                        if (!object)
@@ -619,19 +644,19 @@ static void receive_needs(void)
                        }
                        continue;
                }
-               if (starts_with(line, "deepen ")) {
+               if (skip_prefix(line, "deepen ", &arg)) {
                        char *end;
-                       depth = strtol(line + 7, &end, 0);
-                       if (end == line + 7 || depth <= 0)
+                       depth = strtol(arg, &end, 0);
+                       if (end == arg || depth <= 0)
                                die("Invalid deepen: %s", line);
                        continue;
                }
-               if (!starts_with(line, "want ") ||
-                   get_sha1_hex(line+5, sha1_buf))
+               if (!skip_prefix(line, "want ", &arg) ||
+                   get_sha1_hex(arg, sha1_buf))
                        die("git upload-pack: protocol error, "
                            "expected to get sha, not '%s'", line);
 
-               features = line + 45;
+               features = arg + 40;
 
                if (parse_feature_request(features, "multi_ack_detailed"))
                        multi_ack = 2;
@@ -838,7 +863,7 @@ int main(int argc, char **argv)
        check_replace_refs = 0;
 
        for (i = 1; i < argc; i++) {
-               char *arg = argv[i];
+               const char *arg = argv[i];
 
                if (arg[0] != '-')
                        break;
@@ -854,8 +879,8 @@ int main(int argc, char **argv)
                        strict = 1;
                        continue;
                }
-               if (starts_with(arg, "--timeout=")) {
-                       timeout = atoi(arg+10);
+               if (skip_prefix(arg, "--timeout=", &arg)) {
+                       timeout = atoi(arg);
                        daemon_mode = 1;
                        continue;
                }