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

git merge: don't fail if file content can't be retrieved

Browse Source 
The merge button should be disabled in this case,
but let's avoid the exception as it is done for other revisions.
This commit is contained in:
Kirill Likhodedov
2017-02-26 15:15:56 +00:00
parent 788cddb3b1
commit 116f83e679
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+7 -1
View File
@@ -134,7 +134,13 @@ public class GitMergeProvider implements MergeProvider2 {
catch (Exception ex) {
/// unable to load original revision, use the current instead
/// This could happen in case if rebasing.
mergeData.ORIGINAL = file.contentsToByteArray();
try {
mergeData.ORIGINAL = file.contentsToByteArray();
}
catch (IOException e) {
LOG.error(e);
mergeData.ORIGINAL = ArrayUtil.EMPTY_BYTE_ARRAY;
}
}
mergeData.CURRENT = loadRevisionCatchingErrors(current);
mergeData.LAST = loadRevisionCatchingErrors(last);