diff --git a/src/main/resources/hudson/plugins/git/GitSCM/help-disableGitToolChooser.html b/src/main/resources/hudson/plugins/git/GitSCM/help-disableGitToolChooser.html index d3746a85e8..bb0a037adf 100644 --- a/src/main/resources/hudson/plugins/git/GitSCM/help-disableGitToolChooser.html +++ b/src/main/resources/hudson/plugins/git/GitSCM/help-disableGitToolChooser.html @@ -7,7 +7,7 @@

If JGit and command line git are both enabled on an agent, the git plugin uses a "git tool chooser" to choose a preferred git implementation. The preferred git implementation depends on the size of the repository and the git plugin features requested by the job. - If the repository size is less than the JGit repository size threshold and the git features of the job are all implmented in JGit, then JGit is used. + If the repository size is less than the JGit repository size threshold and the git features of the job are all implemented in JGit, then JGit is used. If the repository size is greater than the JGit repository size threshold or the job requires git features that are not implemented in JGit, then command line git is used.

diff --git a/src/main/resources/hudson/plugins/git/GitSCM/help-extensions.html b/src/main/resources/hudson/plugins/git/GitSCM/help-extensions.html index 6915ca671b..cacd1be767 100644 --- a/src/main/resources/hudson/plugins/git/GitSCM/help-extensions.html +++ b/src/main/resources/hudson/plugins/git/GitSCM/help-extensions.html @@ -21,7 +21,7 @@ Tagging extensions allow the plugin to apply tags in the current workspace.

  • - Build inititation extensions control the conditions that start a build. + Build initiation extensions control the conditions that start a build. They can ignore notifications of a change or force a deeper evaluation of the commits when polling.
  • diff --git a/src/test/java/hudson/plugins/git/GitSCMTest.java b/src/test/java/hudson/plugins/git/GitSCMTest.java index ebde06ef4d..a0d3bd1a60 100644 --- a/src/test/java/hudson/plugins/git/GitSCMTest.java +++ b/src/test/java/hudson/plugins/git/GitSCMTest.java @@ -3202,17 +3202,7 @@ public void testCommitMessageIsPrintedToLogs() throws Exception { sampleRepo.git("commit", "--all", "--message=test commit"); FreeStyleProject p = setupSimpleProject("master"); Run run = rule.buildAndAssertSuccess(p); - TaskListener mockListener = Mockito.mock(TaskListener.class); - Mockito.when(mockListener.getLogger()).thenReturn(Mockito.spy(StreamTaskListener.fromStdout().getLogger())); - - p.getScm().checkout(run, new Launcher.LocalLauncher(listener), - new FilePath(run.getRootDir()).child("tmp-" + "master"), - mockListener, null, SCMRevisionState.NONE); - - ArgumentCaptor logCaptor = ArgumentCaptor.forClass(String.class); - verify(mockListener.getLogger(), atLeastOnce()).println(logCaptor.capture()); - List values = logCaptor.getAllValues(); - assertThat(values, hasItem("Commit message: \"test commit\"")); + rule.waitForMessage("Commit message: \"test commit\"", run); } /**