MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: read commands are silent by default

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-05-27 20:33:28 +03:00
parent a3457508b2
commit b95bbfea8b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/status/GitNewChangesCollector.java
+1 -5
View File
@@ -121,16 +121,12 @@ class GitNewChangesCollector extends GitChangesCollector {
GitSimpleHandler handler = new GitSimpleHandler(myProject, myVcsRoot, GitCommand.STATUS);
final String[] params = {"--porcelain", "-z", "--untracked-files=no"}; // untracked files are stored separately
handler.addParameters(params);
handler.setSilent(true);
handler.setStdoutSuppressed(true);
handler.endOptions();
handler.addRelativePaths(dirtyPaths);
if (handler.isLargeCommandLine()) {
// if there are too much files, just get all changes for the project
handler = new GitSimpleHandler(myProject, myVcsRoot, GitCommand.STATUS);
handler.addParameters(params);
handler.setSilent(true);
handler.setStdoutSuppressed(true);
handler.endOptions();
}
return handler;
@@ -219,7 +215,7 @@ class GitNewChangesCollector extends GitChangesCollector {
case 'U':
if (yStatus == 'U' || yStatus == 'A' || yStatus == 'D' || yStatus == 'T') {
// UU - unmerged, both modified; UD - unmerged, deleted by them; UA - umerged, added by them
// UU - unmerged, both modified; UD - unmerged, deleted by them; UA - unmerged, added by them
reportConflict(filepath, head);
} else {
throwYStatus(output, handler, line, xStatus, yStatus);