Community
Participate
Working Groups
Stack traces are pretty much the same, they all show a NPE thrown when pulling. testGetCloneAndPull Error N/A java.lang.NullPointerException at org.eclipse.orion.server.tests.servlets.git.GitCloneTest.testGetCloneAndPull(GitCloneTest.java:673) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:501) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:259) at org.eclipse.test.CoreTestApplication.runTests(CoreTestApplication.java:36) at org.eclipse.test.CoreTestApplication.run(CoreTestApplication.java:32) at org.eclipse.equinox.internal.app.EclipseAppContainer.callMethodWithException(EclipseAppContainer.java:587) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:198) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:352) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:624) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:579) at org.eclipse.equinox.launcher.Main.run(Main.java:1433) at org.eclipse.equinox.launcher.Main.main(Main.java:1409) at org.eclipse.core.launcher.Main.main(Main.java:34) == testConflict Error N/A java.lang.NullPointerException at org.eclipse.orion.server.tests.servlets.git.GitStatusTest.testConflict(GitStatusTest.java:577) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:501) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:259) at org.eclipse.test.CoreTestApplication.runTests(CoreTestApplication.java:36) at org.eclipse.test.CoreTestApplication.run(CoreTestApplication.java:32) at org.eclipse.equinox.internal.app.EclipseAppContainer.callMethodWithException(EclipseAppContainer.java:587) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:198) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:352) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:624) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:579) at org.eclipse.equinox.launcher.Main.run(Main.java:1433) at org.eclipse.equinox.launcher.Main.main(Main.java:1409) at org.eclipse.core.launcher.Main.main(Main.java:34) == testCreateTrackingBranch Error N/A java.lang.NullPointerException at org.eclipse.orion.server.tests.servlets.git.GitBranchTest.testCreateTrackingBranch(GitBranchTest.java:171) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:501) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:259) at org.eclipse.test.CoreTestApplication.runTests(CoreTestApplication.java:36) at org.eclipse.test.CoreTestApplication.run(CoreTestApplication.java:32) at org.eclipse.equinox.internal.app.EclipseAppContainer.callMethodWithException(EclipseAppContainer.java:587) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:198) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:352) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:624) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:579) at org.eclipse.equinox.launcher.Main.run(Main.java:1433) at org.eclipse.equinox.launcher.Main.main(Main.java:1409) at org.eclipse.core.launcher.Main.main(Main.java:34)
The tests pass when run locally with Orion I20120223-2230 in the Target Platform. Last 2 or 3 builds were fine and I haven't touched the git code since bug 371881.
Ok. Probably fine for 0.4 but would be nice to know what the NPEs are about.
Apparently, PullResult.MergeResult is null in all these cases. Since https://git.eclipse.org/r/#/c/2365/ it may happen if you pull with rebase. Have there been a system settings change for "branch.{name}.rebase" recently? Similar to bug 343150?
(In reply to comment #3) > Have there been a system settings change for "branch.{name}.rebase" recently? > Similar to bug 343150? There have been no other system setting changes. Current settings: > git config --system -l core.filemode=true core.bare=true core.sharedrepository=1 receive.denynonfastforwards=1
Hmm, I would expect "branch.autosetuprebase = always" to be set.
Created attachment 211579 [details] Fix v01 Overwrite user settings, do not auto-rebase when pulling.
Created attachment 211580 [details] mylyn/context/zip
Can be reviewed here: http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?h=bug372489&id=52aa3de016d6c24e5106794a05f0e4d628586989
Being a change only in tests to remove potential failures depending on server setup I +1 as a project for RC3
Apparently not needed if RC3 is backed up to jgit 1.3.0
Just to close the loop from an offline discussion: This was introduced by bug 345536 fix in JGit. The e4Build user on eclipse.org has the branch.autosetuprebase=true config property set. This wasn't honoured by JGit until yesterday.
To be revisited in 0.5 when we start shipping with JGit 2.0 again.
Fixed with 07fce5cc7edc6b053341cb92a18ff1af1e48c1e3
