From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: <git@vger.kernel.org>, Frej Bjon <frej.bjon@nemit.fi>
Subject: Re: [PATCH] remote-curl: make --force-with-lease work with non-ASCII ref names
Date: Mon, 20 Jul 2020 17:02:46 -0700 [thread overview]
Message-ID: <xmqqlfjd91ll.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200720224327.1631947-1-sandals@crustytoothpaste.net> (brian m. carlson's message of "Mon, 20 Jul 2020 22:43:27 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> diff --git a/remote-curl.c b/remote-curl.c
> index 5cbc6e5002..ccf0c27daf 100644
> --- a/remote-curl.c
> +++ b/remote-curl.c
> @@ -121,7 +121,13 @@ static int set_option(const char *name, const char *value)
> }
> else if (!strcmp(name, "cas")) {
> struct strbuf val = STRBUF_INIT;
> - strbuf_addf(&val, "--" CAS_OPT_NAME "=%s", value);
> + strbuf_addstr(&val, "--" CAS_OPT_NAME "=");
> + if (*value == '"') {
> + if (unquote_c_style(&val, value, NULL))
> + return -1;
> + } else {
> + strbuf_addstr(&val, value);
> + }
I wonder if
if (*value != '"')
strbuf_addstr(&val, value);
else if (unquote_c_style(&val, value, NULL))
return -1; /* error */
is easier to read without having to use {braces}, but that's quite
a minor point.
A clean-up opportunity I can see here is to declare that we have
found a good value for CAS_OPT_NAME and inline the string and remove
the C preprocessor macro, but that is obviously an unrelated change
to this fix.
Thanks.
next prev parent reply other threads:[~2020-07-21 0:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 9:10 Cannot delete remote branch with non-ascii name and --force-with-lease Frej Bjon
2020-07-20 22:43 ` [PATCH] remote-curl: make --force-with-lease work with non-ASCII ref names brian m. carlson
2020-07-21 0:02 ` Junio C Hamano [this message]
2020-07-21 1:15 ` [PATCH v2] " brian m. carlson
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=xmqqlfjd91ll.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=frej.bjon@nemit.fi \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/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.
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 NNTP newsgroup(s).