diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java index 060549d29aa5..90bb3e3040ba 100644 --- a/plugins/git4idea/src/git4idea/GitUtil.java +++ b/plugins/git4idea/src/git4idea/GitUtil.java @@ -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 REPOSITORY_TO_ROOT = new Function() { @Override diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 15a2c05366a1..bb48d517a29b 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -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);