write_head_info(): handle "extra refs" locally
The old code basically did: generate array of SHA1s for alternate refs for each unique SHA1 in array: add_extra_ref(".have", sha1) for each ref (including real refs and extra refs): show_ref(refname, sha1) But there is no need to stuff the alternate refs in extra_refs; we can call show_ref() directly when iterating over the array, then handle real refs separately. So change the code to: generate array of SHA1s for alternate refs for each unique SHA1 in array: show_ref(".have", sha1) for each ref (this now only includes real refs): show_ref(refname, sha1) Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Jan 6, 2012 at 15:12 UTC
85f251045019296a9143fd6527a48461e7b7c0e7
1 file changed
+3
-4
builtin/receive-pack.c
+3
-4
@@ -143,9 +143,9 @@ static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, vo
143
return 0;
144
}
145
146
-static void add_one_alternate_sha1(const unsigned char sha1[20], void *unused)
146
+static void show_one_alternate_sha1(const unsigned char sha1[20], void *unused)
147
{
148
- add_extra_ref(".have", sha1, 0);
148
+ show_ref(".have", sha1);
149
}
150
151
static void collect_one_alternate_ref(const struct ref *ref, void *data)
@@ -158,12 +158,11 @@ static void write_head_info(void)
158
{
159
struct sha1_array sa = SHA1_ARRAY_INIT;
160
for_each_alternate_ref(collect_one_alternate_ref, &sa);
161
- sha1_array_for_each_unique(&sa, add_one_alternate_sha1, NULL);
161
+ sha1_array_for_each_unique(&sa, show_one_alternate_sha1, NULL);
162
sha1_array_clear(&sa);
163
for_each_ref(show_ref_cb, NULL);
164
if (!sent_capabilities)
165
show_ref("capabilities^{}", null_sha1);
166
- clear_extra_refs();
166
167
/* EOF */
168
packet_flush(1);