mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-18 06:14:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mh/ref-api-less-extra-refs'

Browse Source 
* mh/ref-api-less-extra-refs:
  write_head_info(): handle "extra refs" locally
  show_ref(): remove unused "flag" and "cb_data" arguments
  receive-pack: move more work into write_head_info()
This commit is contained in:
Junio C Hamano 2012-01-09 15:58:43 -08:00
commit d9af2282c0
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
builtin/receive-pack.c
View File

@ -115,7 +115,7 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb); return git_default_config(var, value, cb);
} }
static int show_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) static void show_ref(const char *path, const unsigned char *sha1)
{ {
if (sent_capabilities) if (sent_capabilities)
packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
@ -125,10 +125,9 @@ static int show_ref(const char *path, const unsigned char *sha1, int flag, void
" report-status delete-refs side-band-64k", " report-status delete-refs side-band-64k",
prefer_ofs_delta ? " ofs-delta" : ""); prefer_ofs_delta ? " ofs-delta" : "");
sent_capabilities = 1; sent_capabilities = 1;
return 0;
} }
static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *cb_data) static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *unused)
{ {
path = strip_namespace(path); path = strip_namespace(path);
/* /*
@ -141,15 +140,33 @@ static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, vo
*/ */
if (!path) if (!path)
path = ".have"; path = ".have";
return show_ref(path, sha1, flag, cb_data); show_ref(path, sha1);
return 0;
}
static void show_one_alternate_sha1(const unsigned char sha1[20], void *unused)
{
show_ref(".have", sha1);
}
static void collect_one_alternate_ref(const struct ref *ref, void *data)
{
struct sha1_array *sa = data;
sha1_array_append(sa, ref->old_sha1);
} }
static void write_head_info(void) static void write_head_info(void)
{ {
struct sha1_array sa = SHA1_ARRAY_INIT;
for_each_alternate_ref(collect_one_alternate_ref, &sa);
sha1_array_for_each_unique(&sa, show_one_alternate_sha1, NULL);
sha1_array_clear(&sa);
for_each_ref(show_ref_cb, NULL); for_each_ref(show_ref_cb, NULL);
if (!sent_capabilities) if (!sent_capabilities)
show_ref("capabilities^{}", null_sha1, 0, NULL); show_ref("capabilities^{}", null_sha1);
/* EOF */
packet_flush(1);
} }
struct command { struct command {
@ -869,25 +886,6 @@ static int delete_only(struct command *commands)
return 1; return 1;
} }
static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused)
{
add_extra_ref(".have", sha1, 0);
}
static void collect_one_alternate_ref(const struct ref *ref, void *data)
{
struct sha1_array *sa = data;
sha1_array_append(sa, ref->old_sha1);
}
static void add_alternate_refs(void)
{
struct sha1_array sa = SHA1_ARRAY_INIT;
for_each_alternate_ref(collect_one_alternate_ref, &sa);
sha1_array_for_each_unique(&sa, add_one_alternate_sha1, NULL);
sha1_array_clear(&sa);
}
int cmd_receive_pack(int argc, const char **argv, const char *prefix) int cmd_receive_pack(int argc, const char **argv, const char *prefix)
{ {
int advertise_refs = 0; int advertise_refs = 0;
@ -937,12 +935,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
unpack_limit = receive_unpack_limit; unpack_limit = receive_unpack_limit;
if (advertise_refs || !stateless_rpc) { if (advertise_refs || !stateless_rpc) {
add_alternate_refs();
write_head_info(); write_head_info();
clear_extra_refs();
/* EOF */
packet_flush(1);
} }
if (advertise_refs) if (advertise_refs)
return 0; return 0;