From 21289e76ebfb7a5dc78b6bdbd068c262c4208049 Mon Sep 17 00:00:00 2001 From: Claudio Date: Mon, 27 Jan 2020 21:52:58 -0300 Subject: [PATCH] Bugfix on checkout --- lib/core/Descriptor.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/core/Descriptor.js b/lib/core/Descriptor.js index b132bae..47d94e7 100644 --- a/lib/core/Descriptor.js +++ b/lib/core/Descriptor.js @@ -63,9 +63,10 @@ module.exports = { if (fs.existsSync(target)) { const repo = git(target); await repo.checkout(config.descriptor.branch); - await repo.pull("origin", config.descriptor.branch); + await repo.pull(remote, config.descriptor.branch); } else { await git().clone(remote, target); + await git(target).checkout(config.descriptor.branch); } return new Promise((resolve, reject) => fs.readFile(path.join(target, "package.json"), (err, data) => { diff --git a/package.json b/package.json index f9ad3d1..1c35bee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "carryall", - "version": "1.1.0", + "version": "1.1.1", "description": "An easy way to keep your environments in sync", "main": "carryall-cli.js", "license": "MIT",