diff options
Diffstat (limited to 'node_modules/pacote/lib/fetchers/git.js')
-rw-r--r-- | node_modules/pacote/lib/fetchers/git.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/node_modules/pacote/lib/fetchers/git.js b/node_modules/pacote/lib/fetchers/git.js index d8af76936..6887277ce 100644 --- a/node_modules/pacote/lib/fetchers/git.js +++ b/node_modules/pacote/lib/fetchers/git.js @@ -102,7 +102,7 @@ function hostedManifest (spec, opts) { } function plainManifest (repo, spec, opts) { - const rawRef = spec.gitCommittish + const rawRef = spec.gitCommittish || spec.gitRange return resolve( repo, rawRef, spec.name, opts ).then(ref => { @@ -125,23 +125,22 @@ function plainManifest (repo, spec, opts) { return { _repo: repo, _rawRef: rawRef, - _resolved: rawRef.match(/^[a-f0-9]{40}$/) && resolved, - _uniqueResolved: rawRef.match(/^[a-f0-9]{40}$/) && resolved + _resolved: rawRef.match(/^[a-f0-9]$/) && resolved, + _uniqueResolved: rawRef.match(/^[a-f0-9]$/) && resolved } } }) } function resolve (url, rawRef, name, opts) { - const semverMatch = rawRef.match(/^semver:v?(.*)/) - const isSemver = semverMatch && semver.validRange(semverMatch[1]) + const isSemver = semver.validRange(rawRef) return git.revs(url, opts).then(remoteRefs => { return isSemver ? pickManifest({ versions: remoteRefs.versions, 'dist-tags': remoteRefs['dist-tags'], name: name - }, semverMatch[1], opts) + }, rawRef, opts) : remoteRefs ? BB.resolve( remoteRefs.refs[rawRef] || remoteRefs.refs[remoteRefs.shas[rawRef]] |