From b117b61f27d259f496a80d2418494f76aca1ac38 Mon Sep 17 00:00:00 2001 From: Codice Ovvio Date: Sat, 10 Feb 2018 16:05:31 +0100 Subject: [PATCH] fix 'split' issue in git.coffee change repo.path to repo.repo.workingDirectory --- lib/git.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/git.coffee b/lib/git.coffee index fc36703..c4200c2 100644 --- a/lib/git.coffee +++ b/lib/git.coffee @@ -132,7 +132,8 @@ module.exports = return repo.getUpstreamBranch() isMerging: -> - return fs.existsSync(path.join(repo.path, 'MERGE_HEAD')) + # return fs.existsSync(path.join(repo.path, 'MERGE_HEAD')) + return fs.existsSync(path.join(repo.repo.workingDirectory, 'MERGE_HEAD')) getBranches: getBranches