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

Fail safe in case of "conflict not found" issue during git merge

Browse Source 
assertTrue just logs the message and doesn't prevent the NPE on the
next line.
This commit is contained in:
Kirill Likhodedov
2017-02-26 11:05:14 +00:00
parent c5c5c3ffc0
commit d4f00a3df8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+5 -2
View File
@@ -464,8 +464,11 @@ public class GitMergeProvider implements MergeProvider2 {
for (VirtualFile f : files) {
String path = VcsFileUtil.relativePath(root, f);
Conflict c = cs.get(path);
LOG.assertTrue(c != null, String.format("The conflict not found for file: %s(%s)%nFull ls-files output: %n%s%nAll files: %n%s",
f.getPath(), path, output, files));
if (c == null) {
LOG.error(String.format("The conflict not found for file: %s(%s)%nFull ls-files output: %n%s%nAll files: %n%s",
f.getPath(), path, output, files));
continue;
}
c.myFile = f;
if (c.myStatusTheirs == null) {
c.myStatusTheirs = Conflict.Status.DELETED;