fix(git): git deps were getting _resolved without shasums

zkat · May 31, 2017 · 96f0675 · 96f0675
1 parent dc0d368
commit 96f0675
Showing 1 changed file with 6 additions and 8 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._resolved || spec.saveSpec || spec.fetchSpec
+    const cacheName = manifest._uniqueResolved || manifest._resolved
     const cacheStream = (
       opts.cache &&
       cacache.get.stream(
@@ -69,11 +69,9 @@ Fetcher.impl(fetchGit, {
             manifest._repo, manifest._ref, manifest._rawRef, tmp, opts
           ).then(HEAD => {
             if (streamError) { throw streamError }
-            if (!manifest._resolved) {
-              manifest._resolved = spec.saveSpec.replace(/#.*/, `#${HEAD}`)
-              manifest._uniqueResolved = manifest._resolved
-            }
-            return packDir(manifest, cacheName, tmp, stream, opts)
+            manifest._resolved = spec.saveSpec.replace(/#.*/, `#${HEAD}`)
+            manifest._uniqueResolved = manifest._resolved
+            return packDir(manifest, manifest._uniqueResolved, tmp, stream, opts)
           })
         }).catch(err => stream.emit('error', err))
       }
@@ -125,8 +123,8 @@ function plainManifest (repo, spec, opts) {
       return {
         _repo: repo,
         _rawRef: rawRef,
-        _resolved: rawRef.match(/^[a-f0-9]$/) && resolved,
-        _uniqueResolved: rawRef.match(/^[a-f0-9]$/) && resolved
+        _resolved: rawRef.match(/^[a-f0-9]{40}$/) && resolved,
+        _uniqueResolved: rawRef.match(/^[a-f0-9]{40}$/) && resolved
       }
     }
   })