diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/git4idea/src/git4idea/log/GitBekParentFixer.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'plugins/git4idea/src/git4idea/log/GitBekParentFixer.java')
| -rw-r--r-- | plugins/git4idea/src/git4idea/log/GitBekParentFixer.java | 6 |
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; } |