Re: [PATCH v8 4/4] config: allow http.<url>.* any user matching
- From
Kyle J. McKay <mackyle@gmail.com>
- Date
- Jul 22, 2013, 22:18 UTC
- Message-ID
- <14CC7E43-3588-4B36-A8E9-79C22D548D8D@gmail.com>
- In-Reply-To
- <7v1u6qclfx.fsf@alter.siamese.dyndns.org>
On Jul 22, 2013, at 14:51, Junio C Hamano wrote:
Show 12 quoted lines
> "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. :)
Show 29 quoted lines
>>> 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.