From: Junio C Hamano <gitster@pobox•com>
To: Fredrik Medley <fredrik.medley@gmail•com>
Cc: git@vger•kernel.org,
Christian Halstrick <christian.halstrick@gmail•com>,
Dan Johnson <computerdruid@gmail•com>, Jeff King <peff@peff•net>,
Jonathan Nieder <jrnieder@gmail•com>,
Duy Nguyen <pclouds@gmail•com>
Subject: Re: [PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want
Date: Thu, 21 May 2015 15:07:53 -0700 [thread overview]
Message-ID: <xmqqpp5th9dy.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: 1432239819-21794-2-git-send-email-fredrik.medley@gmail.com
Fredrik Medley <fredrik.medley@gmail•com> writes:
> To allow future extensions, e.g. allowing non-tip sha1, replace the
> boolean allow_tip_sha1_in_want variable with the flag-style
> allow_request_with_bare_object_name variable.
>
> Signed-off-by: Fredrik Medley <fredrik.medley@gmail•com>
> ---
> fetch-pack.c | 9 ++++++---
> upload-pack.c | 20 +++++++++++++-------
> 2 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/fetch-pack.c b/fetch-pack.c
> index 48526aa..699f586 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -43,7 +43,10 @@ static int marked;
> #define MAX_IN_VAIN 256
>
> static struct prio_queue rev_list = { compare_commits_by_commit_date };
> -static int non_common_revs, multi_ack, use_sideband, allow_tip_sha1_in_want;
> +static int non_common_revs, multi_ack, use_sideband;
> +/* Allow specifying sha1 if it is a ref tip. */
> +#define ALLOW_TIP_SHA1 01
> +static int allow_unadvertised_object_request;
It is better to use "unsigned int" for these bit masks, as we are
not interested in the top-most bit getting special-cased by using a
signed type. I'll amend this (and the one in upload-pack.c) while
applying, so no need to resend only to correct these two, unless you
have other reasons to reroll.
Thanks.
> diff --git a/upload-pack.c b/upload-pack.c
> index 745fda8..726486b 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -35,7 +35,9 @@ static int multi_ack;
> static int no_done;
> static int use_thin_pack, use_ofs_delta, use_include_tag;
> static int no_progress, daemon_mode;
> -static int allow_tip_sha1_in_want;
> +/* Allow specifying sha1 if it is a ref tip. */
> +#define ALLOW_TIP_SHA1 01
> +static int allow_unadvertised_object_request;
next prev parent reply other threads:[~2015-05-21 22:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 22:01 [PATCH] upload-pack: Optionally allow fetching reachable sha1 Fredrik Medley
2015-05-03 17:40 ` Junio C Hamano
2015-05-03 20:13 ` Fredrik Medley
2015-05-03 21:35 ` Eric Sunshine
2015-05-05 21:21 ` [PATCH v2] " Fredrik Medley
2015-05-05 22:16 ` Junio C Hamano
2015-05-06 20:10 ` Fredrik Medley
2015-05-06 20:19 ` Junio C Hamano
2015-05-12 21:14 ` [PATCH 1/3] config.txt: Clarify allowTipSHA1InWant with camelCase Fredrik Medley
2015-05-12 21:14 ` [PATCH 2/3] upload-pack: Prepare to extend allow-tip-sha1-in-want Fredrik Medley
2015-05-12 21:37 ` Eric Sunshine
2015-05-12 21:39 ` Junio C Hamano
2015-05-19 20:19 ` Fredrik Medley
2015-05-12 21:14 ` [PATCH 3/3] upload-pack: Optionally allow fetching reachable sha1 Fredrik Medley
2015-05-12 22:01 ` Eric Sunshine
2015-05-19 20:44 ` [PATCH 1/3] config.txt: clarify allowTipSHA1InWant with camelCase Fredrik Medley
2015-05-19 20:44 ` [PATCH 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want Fredrik Medley
2015-05-19 22:00 ` Junio C Hamano
2015-05-20 19:31 ` Fredrik Medley
2015-05-19 20:44 ` [PATCH 3/3] upload-pack: optionally allow fetching reachable sha1 Fredrik Medley
2015-05-19 22:06 ` Junio C Hamano
2015-05-21 20:23 ` [PATCH v5 1/3] config.txt: clarify allowTipSHA1InWant with camelCase Fredrik Medley
2015-05-21 20:23 ` [PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want Fredrik Medley
2015-05-21 22:07 ` Junio C Hamano [this message]
2015-05-22 23:47 ` Fredrik Medley
2015-05-23 0:53 ` Junio C Hamano
2015-05-21 20:23 ` [PATCH v5 3/3] upload-pack: optionally allow fetching reachable sha1 Fredrik Medley
2015-05-21 22:15 ` Junio C Hamano
2015-05-22 23:55 ` Fredrik Medley
2015-05-23 1:01 ` Junio C Hamano
2015-05-12 21:24 ` [PATCH 1/3] config.txt: Clarify allowTipSHA1InWant with camelCase Eric Sunshine
2015-05-12 21:33 ` Junio C Hamano
2015-05-12 21:35 ` Junio C Hamano
2015-05-05 22:29 ` [PATCH v2] upload-pack: Optionally allow fetching reachable sha1 Eric Sunshine
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpp5th9dy.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=christian.halstrick@gmail$(echo .)com \
--cc=computerdruid@gmail$(echo .)com \
--cc=fredrik.medley@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox