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-84728 Git: don't drop stash after resolving conflicts

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-04-17 20:10:38 +04:00
parent a6a0e327f8
commit 20057ee020
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
+2 -11
View File
@@ -79,21 +79,12 @@ public class GitStashChangesSaver extends GitChangesSaver {
}
public void load() throws VcsException {
Collection<VirtualFile> conflictedRoots = new ArrayList<VirtualFile>();
for (VirtualFile root : myStashedRoots) {
boolean conflict = loadRoot(root);
if (conflict) {
conflictedRoots.add(root);
}
loadRoot(root);
}
boolean conflictsResolved = new UnstashConflictResolver(myProject, myGit, myStashedRoots, myParams).merge();
if (conflictsResolved) {
LOG.info("load: all conflicts resolved, dropping stash in " + myStashedRoots);
for (VirtualFile root : conflictedRoots) {
GitStashUtils.dropStash(myProject, root);
}
}
LOG.info("load: conflicts resolved status is " + conflictsResolved + " in roots " + myStashedRoots);
}
@Override
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+1 -4
View File
@@ -414,10 +414,7 @@ public class GitUnstashDialog extends DialogWrapper {
if (conflict.get()) {
VirtualFile root = d.getGitRoot();
boolean conflictsResolved = new UnstashConflictResolver(project, root, d.getSelectedStash()).merge();
if (conflictsResolved) {
LOG.info("loadRoot " + root + " conflicts resolved, dropping stash");
GitStashUtils.dropStash(project, root);
}
LOG.info("loadRoot " + root + ", conflictsResolved: " + conflictsResolved);
} else if (rc != 0) {
GitUIUtil.showOperationErrors(project, h.errors(), h.printableCommandLine());
}