fix 'split' issue in git.coffee

change repo.path to repo.repo.workingDirectory
codiceovvio · Feb 10, 2018 · b117b61 · b117b61
1 parent 5232598
commit b117b61
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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