Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Implement quick fixes for submodules #838

Merged
kuychaco merged 2 commits into from
May 17, 2017
Merged

Implement quick fixes for submodules #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
174d832
Ignore dirty submodules in changed file list
kuychaco May 17, 2017
75e8fbe
Assume submodules don't have merge markers
kuychaco May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/git-shell-out-strategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ export default class GitShellOutStrategy {
* File Status and Diffs
*/
async getStatusesForChangedFiles() {
const output = await this.exec(['status', '--untracked-files=all', '-z']);
const output = await this.exec(['status', '--untracked-files=all', '--ignore-submodules=dirty', '-z']);

const statusMap = {
'A': 'added',
Expand Down
3 changes: 2 additions & 1 deletion lib/models/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ export default class Repository {
const contents = await readFile(path.join(this.getWorkingDirectoryPath(), relativePath), 'utf8');
return MERGE_MARKER_REGEX.test(contents);
} catch (e) {
if (e.code === 'ENOENT') { return false; } else { throw e; }
// EISDIR implies this is a submodule
if (e.code === 'ENOENT' || e.code === 'EISDIR') { return false; } else { throw e; }
}
}

Expand Down