summaryrefslogtreecommitdiff
path: root/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 13:24:04 -0700
committerTor Norbye <tnorbye@google.com>2014-09-04 13:24:04 -0700
commitc3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch)
treefc0dcd722b6d445468dbe7dad13b4c11781b1cbe /plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
parent1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff)
downloadidea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'plugins/git4idea/src/git4idea/log/GitBekParentFixer.java')
-rw-r--r--plugins/git4idea/src/git4idea/log/GitBekParentFixer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java b/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
index 054ed9f90b48..4bcfade3cfa8 100644
--- a/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
+++ b/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java
@@ -126,6 +126,12 @@ class GitBekParentFixer {
@Nullable
@Override
+ public VcsLogHashFilter getHashFilter() {
+ return null;
+ }
+
+ @Nullable
+ @Override
public VcsLogStructureFilter getStructureFilter() {
return null;
}