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-85380 GitMergeProvider: try to resolve HEAD after MERGE_HEAD and CHERRY_PICK_HEAD as well.

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-04-28 19:23:16 +04:00
parent 71ce04c102
commit df67832271
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+15 -8
View File
@@ -135,12 +135,7 @@ public class GitMergeProvider implements MergeProvider2 {
@Nullable
private VcsRevisionNumber findLastRevisionNumber(@NotNull VirtualFile root) {
if (myReverse) {
try {
return GitRevisionNumber.resolve(myProject, root, "HEAD");
}
catch (VcsException e) {
log.error("Couldn't resolve the HEAD in " + root, e);
}
return resolveHead(root);
}
else {
try {
@@ -152,11 +147,23 @@ public class GitMergeProvider implements MergeProvider2 {
return GitRevisionNumber.resolve(myProject, root, "CHERRY_PICK_HEAD");
}
catch (VcsException e1) {
log.error("Couldn't resolve neither MERGE_HEAD, nor the CHERRY_PICK_HEAD in " + root, e1);
log.info("Couldn't resolve neither MERGE_HEAD, nor the CHERRY_PICK_HEAD in " + root, e1);
// for now, we don't know: maybe it is a conflicted file from rebase => then resolve the head.
return resolveHead(root);
}
}
}
return null;
}
@Nullable
private GitRevisionNumber resolveHead(@NotNull VirtualFile root) {
try {
return GitRevisionNumber.resolve(myProject, root, "HEAD");
}
catch (VcsException e) {
log.error("Couldn't resolve the HEAD in " + root, e);
return null;
}
}
private byte[] loadRevisionCatchingErrors(final GitFileRevision revision) throws VcsException, IOException {