fix: parse branch names containing @

npm · Oct 12, 2022 · 61ca7fb · 61ca7fb
1 parent 3cd4a98
commit 61ca7fb
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 58 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -17,7 +17,7 @@ function protocolToRepresentation (protocol) {
 }
 
 function lastIndexOfBefore (str, char, beforeChar) {
-  const startPosition = str.lastIndexOf(beforeChar)
+  const startPosition = str.indexOf(beforeChar)
   return str.lastIndexOf(char, startPosition > -1 ? startPosition : Infinity)
 }
 
@@ -193,7 +193,9 @@ const isGitHubShorthand = (arg) => {
 
 // attempt to correct an scp style url so that it will parse with `new URL()`
 const correctUrl = (giturl) => {
-  const firstAt = giturl.indexOf('@')
+  // ignore @ that come after the first hash since the denotes the start
+  // of a committish which can contain @ characters
+  const firstAt = lastIndexOfBefore(giturl, '@', '#')
   // ignore colons that come after the hash since that could include colons such as:
   // git@github.com:user/package-2#semver:^1.0.0
   const lastColonBeforeHash = lastIndexOfBefore(giturl, ':', '#')