OSDN Git Service

upload-pack: move "shallow" sending code out of deepen()
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 12 Jun 2016 10:53:46 +0000 (17:53 +0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jun 2016 21:38:16 +0000 (14:38 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
upload-pack.c

index 97ed620..0eb9a0b 100644 (file)
@@ -538,6 +538,20 @@ error:
        }
 }
 
+static void send_shallow(struct commit_list *result)
+{
+       while (result) {
+               struct object *object = &result->item->object;
+               if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
+                       packet_write(1, "shallow %s",
+                                    oid_to_hex(&object->oid));
+                       register_shallow(object->oid.hash);
+                       shallow_nr++;
+               }
+               result = result->next;
+       }
+}
+
 static void deepen(int depth, const struct object_array *shallows)
 {
        struct commit_list *result = NULL, *backup = NULL;
@@ -551,16 +565,7 @@ static void deepen(int depth, const struct object_array *shallows)
                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))) {
-                       packet_write(1, "shallow %s",
-                                    oid_to_hex(&object->oid));
-                       register_shallow(object->oid.hash);
-                       shallow_nr++;
-               }
-               result = result->next;
-       }
+       send_shallow(result);
        free_commit_list(backup);
        for (i = 0; i < shallows->nr; i++) {
                struct object *object = shallows->objects[i].item;