diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-06-12 17:53:46 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-13 14:38:16 -0700 |
| commit | 5c24cdea1e33c72bfed4af25a363eb5ceae11199 (patch) | |
| tree | 62c4241782d2032f44aafa2899529a66338472f1 | |
| parent | e8e44de7874f6ea7cdf35b526f790cc7fa8f34e6 (diff) | |
| download | git-5c24cdea1e33c72bfed4af25a363eb5ceae11199.tar.gz | |
upload-pack: move "shallow" sending code out of deepen()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | upload-pack.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/upload-pack.c b/upload-pack.c index 97ed62002e..0eb9a0b8fa 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -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; |