fix(git): hash was not being replaced/appended correctly

npm · Jun 1, 2017 · 6fcbed5 · 6fcbed5
1 parent d8bbd5b
commit 6fcbed5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/fetchers/git.js b/lib/fetchers/git.js
@@ -50,7 +50,7 @@ Fetcher.impl(fetchGit, {
     opts = optCheck(opts)
     let streamError
     const stream = new PassThrough().on('error', e => { streamError = e })
-    const cacheName = manifest._uniqueResolved || manifest._resolved
+    const cacheName = manifest._uniqueResolved || manifest._resolved || ''
     const cacheStream = (
       opts.cache &&
       cacache.get.stream(
@@ -69,7 +69,7 @@ Fetcher.impl(fetchGit, {
             manifest._repo, manifest._ref, manifest._rawRef, tmp, opts
           ).then(HEAD => {
             if (streamError) { throw streamError }
-            manifest._resolved = spec.saveSpec.replace(/#.*/, `#${HEAD}`)
+            manifest._resolved = spec.saveSpec.replace(/(:?#.*)?$/, `#${HEAD}`)
             manifest._uniqueResolved = manifest._resolved
             return packDir(manifest, manifest._uniqueResolved, tmp, stream, opts)
           })