mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: share more code

Browse Source 
We mark the objects pointed at our refs with "OUR_REF" flag in two
functions (mark_our_ref() and send_ref()), but we can just use the
former as a helper for the latter.

Update the way mark_our_ref() prepares in-core object to use
lookup_unknown_object() to delay reading the actual object data,
just like we did in 435c833 (upload-pack: use peel_ref for ref
advertisements, 2012-10-04).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2013-01-18 15:48:49 -08:00
parent 02f55e660c
commit cbbe50db76
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
upload-pack.c
View File

@ -722,15 +722,28 @@ static void receive_needs(void)
free(shallows.objects); free(shallows.objects);
} }
static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
struct object *o = lookup_unknown_object(sha1);
if (!o)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (!(o->flags & OUR_REF)) {
o->flags |= OUR_REF;
nr_our_refs++;
}
return 0;
}
static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{ {
static const char *capabilities = "multi_ack thin-pack side-band" static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress" " side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed"; " include-tag multi_ack_detailed";
struct object *o = lookup_unknown_object(sha1);
const char *refname_nons = strip_namespace(refname); const char *refname_nons = strip_namespace(refname);
unsigned char peeled[20]; unsigned char peeled[20];
mark_our_ref(refname, sha1, flag, cb_data);
if (capabilities) if (capabilities)
packet_write(1, "%s %s%c%s%s agent=%s\n", packet_write(1, "%s %s%c%s%s agent=%s\n",
sha1_to_hex(sha1), refname_nons, sha1_to_hex(sha1), refname_nons,
@ -740,27 +753,11 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
else else
packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons); packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons);
capabilities = NULL; capabilities = NULL;
if (!(o->flags & OUR_REF)) {
o->flags |= OUR_REF;
nr_our_refs++;
}
if (!peel_ref(refname, peeled)) if (!peel_ref(refname, peeled))
packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons); packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons);
return 0; return 0;
} }
static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
struct object *o = parse_object(sha1);
if (!o)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (!(o->flags & OUR_REF)) {
o->flags |= OUR_REF;
nr_our_refs++;
}
return 0;
}
static void upload_pack(void) static void upload_pack(void)
{ {
if (advertise_refs || !stateless_rpc) { if (advertise_refs || !stateless_rpc) {