summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-05-17 22:51:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-17 23:13:10 (GMT)
commit19143f139d5a1a821d9d066da5d1c136a53ed803 (patch)
treeab0d2e1bb32fd1ea44488f0347c157c8c723103e /upload-pack.c
parent6a2df51c848c86e5620dcdf1a0ee2de637937b77 (diff)
downloadgit-19143f139d5a1a821d9d066da5d1c136a53ed803.zip
git-19143f139d5a1a821d9d066da5d1c136a53ed803.tar.gz
git-19143f139d5a1a821d9d066da5d1c136a53ed803.tar.bz2
shallow: add repository argument to register_shallow
Add a repository argument to allow callers of register_shallow to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c
index a11c6d1..4e4ac0f 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -663,7 +663,7 @@ static void send_shallow(struct commit_list *result)
if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
packet_write_fmt(1, "shallow %s",
oid_to_hex(&object->oid));
- register_shallow(&object->oid);
+ register_shallow(the_repository, &object->oid);
shallow_nr++;
}
result = result->next;
@@ -700,7 +700,7 @@ static void send_unshallow(const struct object_array *shallows)
add_object_array(object, NULL, &extra_edge_obj);
}
/* make sure commit traversal conforms to client */
- register_shallow(&object->oid);
+ register_shallow(the_repository, &object->oid);
}
}
@@ -912,7 +912,8 @@ static void receive_needs(void)
if (shallows.nr > 0) {
int i;
for (i = 0; i < shallows.nr; i++)
- register_shallow(&shallows.objects[i].item->oid);
+ register_shallow(the_repository,
+ &shallows.objects[i].item->oid);
}
shallow_nr += shallows.nr;