On Jul 26, 2013, at 19:43, Jeff King wrote:
On Fri, Jul 26, 2013 at 07:15:07PM -0700, Kyle J. McKay wrote:
So there's a version of this in next as cea9928 and I think that
version is fine. If the documentation gets updated in the future, or
perhaps moved to a separate urls-matching.txt for some reason at some
point (git config --url, git config --url-parse), I'll make a point
of inserting the ", but at lower precedence than a config key with a
user name" text.
Unless you are planning to do that immediately, we are very likely to
forget. Either it is worth adding or not, and if it is, we should not
let having to add one more commit stop us.
Here it is in patch form, so the amount of effort does not influence
I'd lean towards including it, but don't feel strongly.
-- >8 --
Subject: [PATCH] docs: mention precedence of empty username matching
The documentation makes it clear that a URL with a username
will match a config entry with or without a username, but is
not clear that in the presence of both, the one with
username would be preferred.
Signed-off-by: Jeff King <p...@peff.net>
Documentation/config.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0dd5566..f2ed9ef 100644
@@ -1568,7 +1568,8 @@ http.<url>.*::
. 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).
+ config key will match a URL with any user name (including none),
+ but at a lower precedence than a config key with a user name.
The list above is ordered by decreasing precedence; a URL that matches
I like it. :)
+1 for adding it as an incremental patch to next.
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