[RFC 01/14] upload-pack: move parsing of "want" line
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Jan 25, 2017, 22:02 UTC
- Message-ID
- <be83ed22dbea03511bf8f8fe830ca0a365128c05.1485381677.git.jonathantanmy@google.com>
- In-Reply-To
- <cover.1485381677.git.jonathantanmy@google.com>
Refactor to parse "want" lines when the prefix is found. This makes it easier to add support for another prefix, which will be done in a subsequent commit.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- upload-pack.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c index 7597ba340..15c60a204 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -793,8 +793,20 @@ static void receive_needs(void) deepen_rev_list = 1; continue; } - if (!skip_prefix(line, "want ", &arg) || - get_sha1_hex(arg, sha1_buf)) + if (skip_prefix(line, "want ", &arg) && + !get_sha1_hex(arg, sha1_buf)) { + o = parse_object(sha1_buf); + if (!o) + die("git upload-pack: not our ref %s", + sha1_to_hex(sha1_buf)); + if (!(o->flags & WANTED)) { + o->flags |= WANTED; + if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 + || is_our_ref(o))) + has_non_tip = 1; + add_object_array(o, NULL, &want_obj); + } + } else die("git upload-pack: protocol error, " "expected to get sha, not '%s'", line); @@ -820,18 +832,6 @@ static void receive_needs(void) no_progress = 1; if (parse_feature_request(features, "include-tag")) use_include_tag = 1; - - o = parse_object(sha1_buf); - if (!o) - die("git upload-pack: not our ref %s", - sha1_to_hex(sha1_buf)); - if (!(o->flags & WANTED)) { - o->flags |= WANTED; - if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 - || is_our_ref(o))) - has_non_tip = 1; - add_object_array(o, NULL, &want_obj); - } } /*
-- 2.11.0.483.g087da7b7c-goog