MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-190132 git: fix commit using index with many files excluded from commit

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-04-18 15:03:34 +03:00
parent 351ac57239
commit 68973de64d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+9 -7
View File
@@ -483,14 +483,16 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
}
private static void reset(@NotNull Project project, @NotNull VirtualFile root, @NotNull Collection<Change> changes) throws VcsException {
Set<FilePath> paths = new HashSet<>();
paths.addAll(mapNotNull(changes, ChangesUtil::getAfterPath));
paths.addAll(mapNotNull(changes, ChangesUtil::getBeforePath));
Set<FilePath> allPaths = new HashSet<>();
allPaths.addAll(mapNotNull(changes, ChangesUtil::getAfterPath));
allPaths.addAll(mapNotNull(changes, ChangesUtil::getBeforePath));
GitLineHandler handler = new GitLineHandler(project, root, GitCommand.RESET);
handler.endOptions();
handler.addRelativePaths(paths);
Git.getInstance().runCommand(handler).getOutputOrThrow();
for (List<String> paths : VcsFileUtil.chunkPaths(root, allPaths)) {
GitLineHandler handler = new GitLineHandler(project, root, GitCommand.RESET);
handler.endOptions();
handler.addParameters(paths);
Git.getInstance().runCommand(handler).getOutputOrThrow();
}
}
public List<VcsException> commit(List<Change> changes, String preparedComment) {