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] skip replaced in commit references list

Browse Source 
Similar to grafted commits, replaced commits are marked as "replaced". Since this is not a reference, it is not included in references list.

IDEA-169831, EA-99213
This commit is contained in:
Julia Beliaeva
2017-03-20 21:04:30 +03:00
parent df80a4a01a
commit 733b35ba6d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitUtil.java
+1
View File
@@ -83,6 +83,7 @@ public class GitUtil {
public static final String ORIGIN_HEAD = "origin/HEAD";
public static final String GRAFTED = "grafted";
public static final String REPLACED = "replaced";
public static final Function<GitRepository, VirtualFile> REPOSITORY_TO_ROOT = new Function<GitRepository, VirtualFile>() {
@Override
plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+1 -1
View File
@@ -612,7 +612,7 @@ public class GitHistoryUtils {
@NotNull VcsLogObjectsFactory factory,
@NotNull VirtualFile root) {
return ContainerUtil.mapNotNull(refs, refName -> {
if (refName.equals(GitUtil.GRAFTED)) return null;
if (refName.equals(GitUtil.GRAFTED) || refName.equals(GitUtil.REPLACED)) return null;
VcsRefType type = GitRefManager.getRefType(refName);
refName = GitBranchUtil.stripRefsPrefix(refName);
return refName.equals(GitUtil.ORIGIN_HEAD) ? null : factory.createRef(hash, refName, type, root);