fetch-pack: mention server version with verbose output
authorJeff King <peff@peff.net>
Tue, 14 Aug 2012 02:02:10 +0000 (22:02 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2012 04:56:05 +0000 (21:56 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fetch-pack.c
index fdec7f61c13671db8e736325c2336d4cbf71e1f5..fdda36f1497eaa971e81cc1df0fb21ada6d21120 100644 (file)
@@ -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);
 
@@ -829,8 +831,13 @@ 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]);