Merge branch 'en/rebase-doc-hooks-called-by-accident'

[thirdparty/git.git] / credential.c

diff --git a/credential.c b/credential.c
index 108d9e183a5ddac0ccafca25d184cb94710ee9f5..064e25e5d5754b68e54664fbb13b79b289d4e006 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -399,7 +399,14 @@ int credential_from_url_gently(struct credential *c, const char *url,
        cp = proto_end + 3;
        at = strchr(cp, '@');
        colon = strchr(cp, ':');
-       slash = strchrnul(cp, '/');
+
+       /*
+        * A query or fragment marker before the slash ends the host portion.
+        * We'll just continue to call this "slash" for simplicity. Notably our
+        * "trim leading slashes" part won't skip over this part of the path,
+        * but that's what we'd want.
+        */
+       slash = cp + strcspn(cp, "/?#");
 
        if (!at || slash <= at) {
                /* Case (1) */