From ca4ac209d6c477da21971112d451e3ac74b5e32b Mon Sep 17 00:00:00 2001 From: Daniel Hengeveld Date: Fri, 16 Oct 2015 18:49:14 +0200 Subject: [PATCH] Spike checkoutHead --- src/git-repository-async.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/git-repository-async.js b/src/git-repository-async.js index 6a07c93b3..59df07a0b 100644 --- a/src/git-repository-async.js +++ b/src/git-repository-async.js @@ -52,8 +52,8 @@ module.exports = class GitRepositoryAsync { isPathModified(_path) { return this._filterStatusesByPath(_path).then(function(statuses) { - ret = statuses.filter((status)=> { - return status.isModified() || status.isDeleted() + var ret = statuses.filter((status)=> { + return status.isModified() }).length > 0 return Promise.resolve(ret) }) @@ -61,10 +61,19 @@ module.exports = class GitRepositoryAsync { isPathNew(_path) { return this._filterStatusesByPath(_path).then(function(statuses) { - ret = statuses.filter((status)=> { + var ret = statuses.filter((status)=> { return status.isNew() }).length > 0 return Promise.resolve(ret) }) } + + checkoutHead (_path) { + return this.repoPromise.then(function (repo) { + var checkoutOptions = new Git.CheckoutOptions() + checkoutOptions.paths = [_path] + checkoutOptions.checkoutStrategy = Git.Checkout.STRATEGY.FORCE | Git.Checkout.STRATEGY.DISABLE_PATHSPEC_MATCH + Git.Checkout.head(repo, checkoutOptions) + }) + } }