Merge pull request #402 from simplabs/nodegit

Upgrade `nodegit` to v0.23.0
cardstack · Nov 6, 2018 · 8996fe2 · 8996fe2
2 parents 7fb441e + e7fde5c
commit 8996fe2
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,13 @@ sudo: required
 services:
  - docker
 
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libstdc++-4.9-dev
+
 env:
   global:
     - ELASTICSEARCH=http://127.0.0.1:9200

diff --git a/packages/git/blueprints/cardstack-git-seeds/index.js b/packages/git/blueprints/cardstack-git-seeds/index.js
@@ -3,7 +3,7 @@ const {
   Branch,
   Reference,
   Commit
-} = require('@cardstack/nodegit');
+} = require('nodegit');
 
 
 /* eslint-env node */

diff --git a/packages/git/change.js b/packages/git/change.js
@@ -8,7 +8,7 @@ const {
   Tree,
   setThreadSafetyStatus,
   TreeEntry: { FILEMODE }
-} = require('@cardstack/nodegit');
+} = require('nodegit');
 const {
   MutableTree,
   NotFound,

diff --git a/packages/git/indexer.js b/packages/git/indexer.js
@@ -85,7 +85,7 @@ const {
   Commit,
   Clone,
   Cred,
-} = require('@cardstack/nodegit');
+} = require('nodegit');
 const { promisify } = require('util');
 const temp = require('temp').track();
 

diff --git a/packages/git/mutable-tree.js b/packages/git/mutable-tree.js
@@ -2,7 +2,7 @@
 // not-yet-written tree. But you can't recursively put a Treebuilder
 // inside a Treebuilder. That's where this class comes in.
 
-const { TreeEntry, Treebuilder, Blob } = require('@cardstack/nodegit');
+const { TreeEntry, Treebuilder, Blob } = require('nodegit');
 const { FILEMODE } = TreeEntry;
 const tombstone = {};
 

diff --git a/packages/git/node-tests/writer-remote-test.js b/packages/git/node-tests/writer-remote-test.js
@@ -2,7 +2,7 @@ const {
   Cred,
   Clone,
   Reset
-} = require('@cardstack/nodegit');
+} = require('nodegit');
 
 const { inRepo } = require('./support');
 const {

diff --git a/packages/git/package.json b/packages/git/package.json
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@cardstack/logger": "^0.1.0",
-    "@cardstack/nodegit": "^0.21.2-cardstack.1",
     "@cardstack/plugin-utils": "0.11.6",
     "moment-timezone": "^0.5.11",
+    "nodegit": "^0.23.0",
     "temp": "^0.8.3"
   },
   "devDependencies": {

diff --git a/packages/git/writer.js b/packages/git/writer.js
@@ -2,7 +2,7 @@ const {
   Repository,
   Cred,
   Clone
-} = require('@cardstack/nodegit');
+} = require('nodegit');
 
 const crypto = require('crypto');
 const Change = require('./change');