Re: [PATCH 4/4] fetch-pack: mention server version with verbose output
- From
Jeff King <peff@peff.net>
- Date
- Aug 14, 2012, 02:02 UTC
- Message-ID
- <20120814020210.GB7891@sigill.intra.peff.net>
- In-Reply-To
- <20120814015927.GA7891@sigill.intra.peff.net>
On Mon, Aug 13, 2012 at 09:59:27PM -0400, Jeff King wrote:
Show 7 quoted lines
> So if we want to avoid the allocation, then this is how I would do it: > by returning the feature's _value_ and not the whole key. Since we know > that the beginning part must obviously match what we fed it anyway, it > is not that interesting. > > -- >8 -- > Subject: [PATCH] parse_feature_request: make it easier to see feature values
And here is the rebased 4/4 on top of that.
At this point, I think this part of the topic has received more than enough attention. Please feel free to apply these patches, your patches, or even just drop it altogether (and when somebody has a more compelling reason to actually parse such a value, they can resurrect the infrastructure patch).
-- >8 -- Subject: [PATCH] fetch-pack: mention server version with verbose output
Fetch-pack's verbose mode is more of a debugging mode (and in fact takes two "-v" arguments to trigger via the porcelain layer). Let's mention the server version as another possible item of interest.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/fetch-pack.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index bc7a0f9..3b2b5a4 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -787,6 +787,8 @@ static struct ref *do_fetch_pack(int fd[2], { struct ref *ref = copy_ref_list(orig_ref); unsigned char sha1[20]; + const char *agent_feature; + int agent_len; sort_ref_list(&ref, ref_compare_name); @@ -823,8 +825,14 @@ static struct ref *do_fetch_pack(int fd[2], fprintf(stderr, "Server supports ofs-delta\n"); } else prefer_ofs_delta = 0; - if (server_supports("agent")) + + if ((agent_feature = server_feature_value("agent", &agent_len))) { agent_supported = 1; + if (args.verbose && agent_len) { + fprintf(stderr, "Server version is %.*s\n", + agent_len, agent_feature); + } + } if (everything_local(&ref, nr_match, match)) { packet_flush(fd[1]);
-- 1.7.12.rc2.11.gf0a1e27