On Thu, Jul 25, 2013 at 03:39:13PM -0700, Kyle J. McKay wrote: > Overhaul the text of the http.<url>.* options documentation > providing a hopefully easier to understand itemized list of > matching behavior as suggested by and including text from > Jeff King. > ---
Signed-off-by: Jeff King <p...@peff.net> You should add your S-O-B, too, for your bits. > +-- > +. Scheme (e.g., `https` in `https://example.com/`). This field > + must match exactly between the config key and the URL. > +. Host/domain name (e.g., `example.com` in `https://example.com/`). > + This field must match exactly between the config key and the URL. These look fine in the rendered manpage, but I think the source might be a little easier to read with a blank line between items. > +. Port number (e.g., `8080` in `http://example.com:8080/`). > + This field must match exactly between the config key and the URL. > + Omitted port numbers are automatically converted to the correct > + default for the scheme before matching. Thanks, I forgot to include port number in my original suggested text. > +. Exact user name match (e.g., `user` in > `https://u...@example.com/repo.git`). > + If the config key has a user name it must match the user name in the URL > + exactly. > +. Any user name match. If a config key does not have a user name, that > config > + key will match a URL with any user name (including none). IMHO, this would be more clear as a single item, like: . User name (e.g., `user` in `https://u...@example.com/repo.git`). If the config key has a user name it must match the user name in the URL exactly. If the config key does not have a user name, that config key will match a URL with any user name (including none). > +All URLs are normalized before attempting any matching (the password part, > +if embedded in the URL, is always ignored for matching purposes) so that > +equivalent urls that are simply spelled differently will match properly. And this nicely ties up the open questions I had after re-reading the list. Good. We could define "equivalent" here (the %-encoding thing is obvious, I think, but which components are case-sensitive and which are not is perhaps a bit subtle). I do not necessarily know that it is useful to the user, though, and is one more thing to confuse them. And somebody who really cares can look at the appropriate RFCs. So this patch looks pretty good to me; the two points I raised above are how I would have done it, but they are relatively minor if you do not agree. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
