This will make it easier to reuse the capabilities in a later patch.
Signed-off-by: Stefan Beller <sbel...@google.com>
---
upload-pack.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 6734777..a5f75b7 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -716,33 +716,35 @@ static void format_symref_info(struct strbuf *buf, struct
string_list *symref)
strbuf_addf(buf, " symref=%s:%s", item->string, (char
*)item->util);
}
-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 *advertise_capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"
" include-tag multi_ack_detailed";
+
+static int send_ref(const char *refname, const unsigned char *sha1, int flag,
void *cb_data)
+{
+
const char *refname_nons = strip_namespace(refname);
unsigned char peeled[20];
if (mark_our_ref(refname, sha1))
return 0;
- if (capabilities) {
+ if (advertise_capabilities) {
struct strbuf symref_info = STRBUF_INIT;
format_symref_info(&symref_info, cb_data);
packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
sha1_to_hex(sha1), refname_nons,
- 0, capabilities,
+ 0, advertise_capabilities,
allow_tip_sha1_in_want ? " allow-tip-sha1-in-want"
: "",
stateless_rpc ? " no-done" : "",
symref_info.buf,
git_user_agent_sanitized());
strbuf_release(&symref_info);
+ advertise_capabilities = NULL;
} else {
packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons);
}
- capabilities = NULL;
if (!peel_ref(refname, peeled))
packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled),
refname_nons);
return 0;
--
2.4.1.345.gab207b6.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
