Jonathan Tan wrote:
> Commit 5e3548ef16 ("fetch: send server options when using protocol v2",
> 2018-04-24) taught "fetch" the ability to send server options when using
> protocol v2, but not "clone". This ability is triggered by "-o" or
> "--server-option".
>
> Teach "clone" the same ability, except that because "clone" already
> has "-o" for another parameter, teach "clone" only to receive
> "--server-option".
Can you give an example of what this would be used for? An example I
can think of might be
git clone --server-option=priority=batch <url>
> Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
> ---
> Documentation/git-clone.txt | 7 +++++++
> builtin/clone.c | 6 ++++++
> t/t5702-protocol-v2.sh | 11 +++++++++++
> 3 files changed, 24 insertions(+)
Thanks.
[...]
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -66,6 +66,7 @@ static int option_dissociate;
> static int max_jobs = -1;
> static struct string_list option_recurse_submodules = STRING_LIST_INIT_NODUP;
> static struct list_objects_filter_options filter_options;
> +static struct string_list server_options = STRING_LIST_INIT_DUP;
The other string-list options in this file all use NODUP. Is there a
reason this one uses DUP instead? (Just curious --- I suspect either
would work fine, since nothing here does tricks with modifying argv
entries after option parsing.)
The same question applies to the corresponding option in
builtin/fetch.c, so while it is not likely to matter in practice, it
would be nice for readability to find out.
>
> static int recurse_submodules_cb(const struct option *opt,
> const char *arg, int unset)
> @@ -137,6 +138,8 @@ static struct option builtin_clone_options[] = {
> N_("separate git dir from working tree")),
> OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
> N_("set config inside the new repository")),
> + OPT_STRING_LIST(0, "server-option", &server_options, N_("server-specific"),
nit: long line
> + N_("option to transmit")),
[...]
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -251,6 +251,17 @@ test_expect_success 'server-options are sent when fetching' '
> grep "server-option=world" log
> '
>
> +test_expect_success 'server-options are sent when cloning' '
> + test_when_finished "rm -rf log myclone" &&
> +
> + GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
> + clone --server-option=hello --server-option=world \
> + "file://$(pwd)/file_parent" myclone &&
> +
> + grep "server-option=hello" log &&
> + grep "server-option=world" log
> +'
Nice. Thanks for including this.
Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Thanks for a pleasant read.
