From: "Kyle J. McKay" <mackyle@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "David Aguilar" <davvid@gmail.com>,
"Petr Baudis" <pasky@ucw.cz>,
"Richard Hartmann" <richih.mailinglist@gmail.com>,
"Jeff King" <peff@peff.net>,
"Daniel Knittl-Frank" <knittl89@googlemail.com>,
"Jan Krüger" <jk@jk.gs>, "Alejandro Mery" <amery@geeks.cl>,
"Aaron Schrab" <aaron@schrab.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v8 4/4] config: allow http.<url>.* any user matching
Date: Mon, 22 Jul 2013 15:18:00 -0700 [thread overview]
Message-ID: <14CC7E43-3588-4B36-A8E9-79C22D548D8D@gmail.com> (raw)
In-Reply-To: <7v1u6qclfx.fsf@alter.siamese.dyndns.org>
On Jul 22, 2013, at 14:51, Junio C Hamano wrote:
> "Kyle J. McKay" <mackyle@gmail.com> writes:
>
>>> A solid wall of text is somewhat hard to read, so I'd queue the
>>> equivalent of the following "git diff -w" output on top.
>>
>> Can I send out the change as a 'fixup!' patch? Or do I need to
>> send a
>> new v9 patch series with the documentation update?
>
> If you are OK with splitting it into two paragraphs with the
> "longest" clarification tweak (the "patch" I showed you), just
> saying so and I can squash ;-) so there is no need to resend.
The wording of:
"+ password part, if present in the url, is always ignored). A <url>
+ with longer path matches take precedence over shorter matches no
matter
+ what order they occur in the configuration file.
needs to be fixed first. Replace "take" with "takes" and you can go
ahead and squash it in. :)
>>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>>> index c418adf..635ed5d 100644
>>> --- a/Documentation/config.txt
>>> +++ b/Documentation/config.txt
>>> @@ -1521,9 +1521,11 @@ http.<url>.*::
>>> path portion is an exact match or a prefix that matches at a "/"
>>> boundary. If <url> does not include a user name, it will match a
>>> url
>>> with any username otherwise the user name must match as well (the
>>> - password part, if present in the url, is always ignored).
>>> Longer <url>
>>> - path matches take precedence over shorter matches no matter
>>> what order
>>> - they occur in. For example, if both
>>> "https://user@example.com/
>>> path" and
>>> + password part, if present in the url, is always ignored). A <url>
>>> + with longer path matches take precedence over shorter matches
>>> no matter
>>> + what order they occur in the configuration file.
>>> ++
>>> +For example, if both "https://user@example.com/path" and
>>> "https://example.com/path/name" are used as a config <url> value and
>>> then "https://user@example.com/path/name/here" is passed to a git
>>> command, the settings in the "https://example.com/path/name" section
>>
>> OK.
>
> ... which essentially is your "OK" ;-)
Yes, I meant that as "OK I will send out an update that includes
something like this."
After replacing "take" with "takes" in the change I'm good with just
squashing that diff in.
next prev parent reply other threads:[~2013-07-22 22:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 12:56 [PATCH v8 0/4] config: add support for http.<url>.* settings Kyle J. McKay
2013-07-22 12:56 ` [PATCH v8 1/4] " Kyle J. McKay
2013-07-24 7:12 ` Jeff King
2013-07-22 12:56 ` [PATCH v8 2/4] config: improve " Kyle J. McKay
2013-07-22 12:56 ` [PATCH v8 3/4] tests: add new test for the url_normalize function Kyle J. McKay
2013-07-24 6:59 ` Jeff King
2013-07-24 17:14 ` Junio C Hamano
2013-07-24 18:43 ` Kyle J. McKay
2013-07-24 19:01 ` Kyle J. McKay
2013-07-24 19:03 ` Jeff King
2013-07-22 12:56 ` [PATCH v8 4/4] config: allow http.<url>.* any user matching Kyle J. McKay
2013-07-22 18:00 ` Junio C Hamano
2013-07-22 20:24 ` Kyle J. McKay
2013-07-22 21:51 ` Junio C Hamano
2013-07-22 22:18 ` Kyle J. McKay [this message]
2013-07-22 22:34 ` Junio C Hamano
2013-07-24 6:42 ` Jeff King
2013-07-24 15:00 ` Junio C Hamano
2013-07-24 6:44 ` 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=14CC7E43-3588-4B36-A8E9-79C22D548D8D@gmail.com \
--to=mackyle@gmail.com \
--cc=aaron@schrab.com \
--cc=amery@geeks.cl \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jk@jk.gs \
--cc=knittl89@googlemail.com \
--cc=pasky@ucw.cz \
--cc=peff@peff.net \
--cc=richih.mailinglist@gmail.com \
--cc=sunshine@sunshineco.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).