github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Take the submodule into account in more instances.

Browse Source 
Fixes https://github.com/atom/git-diff/issues/97.
This commit is contained in:
joshaber
2016-03-28 14:50:04 -04:00
parent 22665c24d1
commit 51831b332d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/git-repository-async.js
View File

@@ -596,7 +596,7 @@ export default class GitRepositoryAsync {
// * `added` The {Number} of added lines.
// * `deleted` The {Number} of deleted lines.
getDiffStats (_path) {
return this.getRepo()
return this.getRepo(_path)
.then(repo => Promise.all([repo, repo.getHeadCommit()]))
.then(([repo, headCommit]) => Promise.all([repo, headCommit.getTree()]))
.then(([repo, tree]) => {
@@ -640,7 +640,7 @@ export default class GitRepositoryAsync {
// * `newLines` The {Number} of lines in the new hunk
getLineDiffs (_path, text) {
let relativePath = null
return this.getRepo()
return this.getRepo(_path)
.then(repo => {
relativePath = this.relativize(_path, repo.workdir())
return repo.getHeadCommit()
@@ -678,7 +678,7 @@ export default class GitRepositoryAsync {
// Returns a {Promise} that resolves or rejects depending on whether the
// method was successful.
checkoutHead (_path) {
return this.getRepo()
return this.getRepo(_path)
.then(repo => {
const checkoutOptions = new Git.CheckoutOptions()
checkoutOptions.paths = [this.relativize(_path, repo.workdir())]