pacote@2.7.26

This should fix more git issues

3 files changed, 36 insertions, 18 deletions

diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md
index 8d3e04a5a..259b6982f 100644
--- a/node_modules/pacote/CHANGELOG.md
+++ b/node_modules/pacote/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="2.7.26"></a>
+## [2.7.26](https://github.com/zkat/pacote/compare/v2.7.25...v2.7.26) (2017-06-01)
+
+
+### Bug Fixes
+
+* **git:** hash was not being replaced/appended correctly ([6fcbed5](https://github.com/zkat/pacote/commit/6fcbed5))
+
+
+
+<a name="2.7.25"></a>
+## [2.7.25](https://github.com/zkat/pacote/compare/v2.7.24...v2.7.25) (2017-05-31)
+
+
+### Bug Fixes
+
+* **git:** git deps were getting _resolved without shasums ([96f0675](https://github.com/zkat/pacote/commit/96f0675))
+
+
+
 <a name="2.7.24"></a>
 ## [2.7.24](https://github.com/zkat/pacote/compare/v2.7.23...v2.7.24) (2017-05-31)
 
diff --git a/node_modules/pacote/lib/fetchers/git.js b/node_modules/pacote/lib/fetchers/git.js
index 6887277ce..7787e2ef4 100644
--- a/node_modules/pacote/lib/fetchers/git.js
+++ b/node_modules/pacote/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
       }
     }
   })
diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json
index 2f7614566..70970a168 100644
--- a/node_modules/pacote/package.json
+++ b/node_modules/pacote/package.json
@@ -1,8 +1,8 @@
 {
-  "_from": "pacote@2.7.24",
-  "_id": "pacote@2.7.24",
+  "_from": "pacote@2.7.26",
+  "_id": "pacote@2.7.26",
   "_inBundle": false,
-  "_integrity": "sha512-ZUyifBqBzZ5FQU0zemQmwD4BfNT04H+4ljsP+MqKTt0lEI9Jbm/MQYrHJH5MG6pmv68ZvsbmaIG4G07rSrldxA==",
+  "_integrity": "sha512-/DT9ehDr49F+6lMNXHvEe/AjTxYgT+jejGtK7wFLAKaYsxdTqewpncXvm3jzYAOF2tEfAwA54duktrA7JkCH+g==",
   "_location": "/pacote",
   "_phantomChildren": {
     "cacache": "9.2.6",
@@ -21,20 +21,20 @@
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "pacote@2.7.24",
+    "raw": "pacote@2.7.26",
     "name": "pacote",
     "escapedName": "pacote",
-    "rawSpec": "2.7.24",
+    "rawSpec": "2.7.26",
     "saveSpec": null,
-    "fetchSpec": "2.7.24"
+    "fetchSpec": "2.7.26"
   },
   "_requiredBy": [
     "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.24.tgz",
-  "_shasum": "a817c8b6a070e99d47b1e05fc92e9fa4d5057905",
-  "_spec": "pacote@2.7.24",
+  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.26.tgz",
+  "_shasum": "3a3fa8921c00e0d27299c0c1288e32d148b1a73c",
+  "_spec": "pacote@2.7.26",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
@@ -120,5 +120,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "2.7.24"
+  "version": "2.7.26"
 }