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-97728 Git branch does not show in commit info

Browse Source
This commit is contained in:
irengrig
2012-12-20 18:08:20 +04:00
parent 9a1243855c
commit 24e296ac27
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/wholeTree/DetailsCache.java
+2 -1
View File
@@ -157,7 +157,8 @@ public class DetailsCache {
@Override @Override
public void run(@NotNull ProgressIndicator indicator) { public void run(@NotNull ProgressIndicator indicator) {
if (!recheck.process(abstractHash)) return; if (!recheck.process(abstractHash)) return;
if (getBranches(root, abstractHash) != null) return; List<String> branches1 = getBranches(root, abstractHash);
if (branches1 != null && ! branches1.isEmpty()) return;
List<String> branches; List<String> branches;
try { try {
branches = new LowLevelAccessImpl(myProject, root).getBranchesWithCommit(abstractHash.getString()); branches = new LowLevelAccessImpl(myProject, root).getBranchesWithCommit(abstractHash.getString());
plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+1 -1
View File
@@ -495,7 +495,7 @@ public class GitLogUI implements Disposable {
if (commitI == null) return; if (commitI == null) return;
final VirtualFile root = commitI.selectRepository(myRootsUnderVcs); final VirtualFile root = commitI.selectRepository(myRootsUnderVcs);
final List<String> branches = myDetailsCache.getBranches(root, commitI.getHash()); final List<String> branches = myDetailsCache.getBranches(root, commitI.getHash());
if (branches != null) { if (branches != null && ! branches.isEmpty()) {
try { try {
myBranchesLoader.take(commitI, branches); myBranchesLoader.take(commitI, branches);
} }