github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

If we can't refresh a submodule, drop it.

Browse Source
This commit is contained in:
joshaber
2016-01-19 11:59:16 -05:00
parent ab02a7b5a9
commit 514842ca77
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,17 +853,26 @@ export default class GitRepositoryAsync {
}
for (const name in this.submodules) {
if (submoduleNames.indexOf(name) < 0) {
const repo = this.submodules[name]
const repo = this.submodules[name]
const gone = submoduleNames.indexOf(name) < 0
if (gone) {
repo.destroy()
delete this.submodules[name]
} else {
try {
await repo.refreshStatus()
} catch (e) {
// If we error trying to refresh, then it probably means the submodule
// isn't actually a submodule. Libgit2 will report anything listed in
// .gitmodules as a submodule, but that's not necessarily accurate. So
// get rid of the submodule entry.
repo.destroy()
delete this.submodules[name]
}
}
}
const submoduleRepos = _.values(this.submodules)
await Promise.all(submoduleRepos.map(s => s.refreshStatus()))
return submoduleRepos
return _.values(this.submodules)
}
// Get the status for the submodules in the repository.