diff options
author | Ronald Bhuleskar <funronald@google.com> | 2022-08-03 17:16:34 -0400 |
---|---|---|
committer | Ronald Bhuleskar <funronald@google.com> | 2022-08-03 17:16:34 -0400 |
commit | e5e46bc53637f1e1227e81863d403e9fbb84aa19 (patch) | |
tree | 2d54f051bcb0c735de3a167d2896c2de74690ddb /org.eclipse.jgit.test/tst/org/eclipse/jgit/api | |
parent | ceb51a5e0e9db166e572ea7cd362795b4662b0cd (diff) | |
download | jgit-e5e46bc53637f1e1227e81863d403e9fbb84aa19.tar.gz jgit-e5e46bc53637f1e1227e81863d403e9fbb84aa19.zip |
Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."
This reverts commit ceb51a5e0e9db166e572ea7cd362795b4662b0cd.
Reason for revert: The change in https://git.eclipse.org/r/c/jgit/jgit/+/194354 broke the egit test [1]. Calling c.getShortMessage() causes an NPE.
[1] https://ci.eclipse.org/egit/job/egit.gerrit/2711/
Change-Id: I411565b6eaa0bbb562cc1c8a355942ff09fd29bc
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/api')
-rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogFilterTest.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogFilterTest.java index 46095b3848..fa9c742f70 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogFilterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogFilterTest.java @@ -20,7 +20,6 @@ import java.util.Iterator; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.util.FileUtils; import org.junit.After; import org.junit.Before; @@ -32,13 +31,10 @@ import org.junit.Test; public class LogFilterTest extends RepositoryTestCase { private Git git; - private RevWalk rw; - @Before public void setup() throws Exception { super.setUp(); git = new Git(db); - rw = new RevWalk(db); // create first file File file = new File(db.getWorkTree(), "a.txt"); @@ -102,7 +98,6 @@ public class LogFilterTest extends RepositoryTestCase { public void testLogWithFilterCanDistinguishFilesByPath() throws Exception { int count = 0; for (RevCommit c : git.log().addPath("a.txt").call()) { - rw.parseHeaders(c); assertEquals("commit1", c.getFullMessage()); count++; } @@ -110,7 +105,6 @@ public class LogFilterTest extends RepositoryTestCase { count = 0; for (RevCommit c : git.log().addPath("b.txt").call()) { - rw.parseHeaders(c); assertEquals("commit2", c.getFullMessage()); count++; } @@ -121,7 +115,6 @@ public class LogFilterTest extends RepositoryTestCase { public void testLogWithFilterCanIncludeFilesInDirectory() throws Exception { int count = 0; for (RevCommit c : git.log().addPath("subdir-include").call()) { - rw.parseHeaders(c); assertEquals("commit3", c.getFullMessage()); count++; } |