From: Stefan Beller <sbeller@google.com>
To: dturner@twopensource.com
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Stefan Beller" <sbeller@google.com>
Subject: [PATCH 01/14] upload-pack: make client capability parsing code a separate function
Date: Fri, 29 Apr 2016 16:34:34 -0700 [thread overview]
Message-ID: <1461972887-22100-2-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1461972887-22100-1-git-send-email-sbeller@google.com>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
upload-pack.c | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index dc802a0..aaaf883 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -535,6 +535,28 @@ error:
}
}
+static void parse_features(const char *features)
+{
+ if (parse_feature_request(features, "multi_ack_detailed"))
+ multi_ack = 2;
+ else if (parse_feature_request(features, "multi_ack"))
+ multi_ack = 1;
+ if (parse_feature_request(features, "no-done"))
+ no_done = 1;
+ if (parse_feature_request(features, "thin-pack"))
+ use_thin_pack = 1;
+ if (parse_feature_request(features, "ofs-delta"))
+ use_ofs_delta = 1;
+ if (parse_feature_request(features, "side-band-64k"))
+ use_sideband = LARGE_PACKET_MAX;
+ else if (parse_feature_request(features, "side-band"))
+ use_sideband = DEFAULT_PACKET_MAX;
+ if (parse_feature_request(features, "no-progress"))
+ no_progress = 1;
+ if (parse_feature_request(features, "include-tag"))
+ use_include_tag = 1;
+}
+
static void receive_needs(void)
{
struct object_array shallows = OBJECT_ARRAY_INIT;
@@ -544,7 +566,6 @@ static void receive_needs(void)
shallow_nr = 0;
for (;;) {
struct object *o;
- const char *features;
unsigned char sha1_buf[20];
char *line = packet_read_line(0, NULL);
reset_timeout();
@@ -579,26 +600,7 @@ static void receive_needs(void)
die("git upload-pack: protocol error, "
"expected to get sha, not '%s'", line);
- features = line + 45;
-
- if (parse_feature_request(features, "multi_ack_detailed"))
- multi_ack = 2;
- else if (parse_feature_request(features, "multi_ack"))
- multi_ack = 1;
- if (parse_feature_request(features, "no-done"))
- no_done = 1;
- if (parse_feature_request(features, "thin-pack"))
- use_thin_pack = 1;
- if (parse_feature_request(features, "ofs-delta"))
- use_ofs_delta = 1;
- if (parse_feature_request(features, "side-band-64k"))
- use_sideband = LARGE_PACKET_MAX;
- else if (parse_feature_request(features, "side-band"))
- use_sideband = DEFAULT_PACKET_MAX;
- if (parse_feature_request(features, "no-progress"))
- no_progress = 1;
- if (parse_feature_request(features, "include-tag"))
- use_include_tag = 1;
+ parse_features(line + 45);
o = parse_object(sha1_buf);
if (!o)
--
2.8.0.32.g71f8beb.dirty
next prev parent reply other threads:[~2016-04-29 23:35 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 23:34 [WIP PATCH 00/14] Protocol v2 patches Stefan Beller
2016-04-29 23:34 ` Stefan Beller [this message]
2016-04-29 23:34 ` [PATCH 02/14] upload-pack.c: Refactor capability advertising Stefan Beller
2016-04-30 1:04 ` David Turner
2016-05-04 20:05 ` Junio C Hamano
2016-04-29 23:34 ` [PATCH 03/14] upload-pack-2: Implement the version 2 of upload-pack Stefan Beller
2016-05-02 17:43 ` David Turner
2016-05-02 17:51 ` Stefan Beller
2016-05-02 18:56 ` David Turner
2016-05-03 0:31 ` Duy Nguyen
2016-05-04 20:11 ` Junio C Hamano
2016-04-29 23:34 ` [PATCH 04/14] connect: rewrite feature parsing to work on string_list Stefan Beller
2016-05-02 18:18 ` David Turner
2016-05-02 18:46 ` Stefan Beller
2016-05-04 20:13 ` Junio C Hamano
2016-05-17 22:23 ` David Turner
2016-04-29 23:34 ` [PATCH 05/14] transport: add infrastructure to support a protocol version number Stefan Beller
2016-04-29 23:34 ` [PATCH 06/14] remote.h: add get_remote_capabilities, request_capabilities Stefan Beller
2016-05-02 18:57 ` David Turner
2016-05-03 5:33 ` Jeff King
2016-05-03 21:21 ` David Turner
2016-05-04 16:44 ` Stefan Beller
2016-04-29 23:34 ` [PATCH 07/14] fetch-pack: move capability selection out of do_fetch_pack Stefan Beller
2016-04-29 23:34 ` [PATCH 08/14] fetch-pack: factor out get_selected_capabilities_list Stefan Beller
2016-05-02 19:09 ` David Turner
2016-04-29 23:34 ` [PATCH 09/14] fetch-pack: Add negotiate_capabilities Stefan Beller
2016-04-29 23:34 ` [PATCH 10/14] do_fetch_pack: select capabilities for transport version 1 only Stefan Beller
2016-04-29 23:34 ` [PATCH 11/14] builtin/fetch-pack: add argument for transport version Stefan Beller
2016-04-29 23:34 ` [PATCH 12/14] Add test for fetch-pack Stefan Beller
2016-05-02 19:45 ` David Turner
2016-04-29 23:34 ` [PATCH 13/14] WIP add test for git pull Stefan Beller
2016-04-29 23:34 ` [PATCH 14/14] WIP test git fetch Stefan Beller
2016-05-02 20:41 ` [WIP PATCH 00/14] Protocol v2 patches David Turner
2016-05-02 20:43 ` Stefan Beller
2016-05-24 22:46 ` David Turner
2016-05-24 23:03 ` Duy Nguyen
2016-05-25 16:45 ` David Turner
2016-05-25 16:23 ` Junio C Hamano
2016-05-25 19:31 ` David Turner
2016-05-25 21:29 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461972887-22100-2-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).