Merge pull request #3 from jenkinsci/master

Updating the local repository

src/main/resources/hudson/plugins/git/GitSCM/help-disableGitToolChooser.html

@@ -7,7 +7,7 @@
 <p>
   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 <strong>less than</strong> 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 <strong>less than</strong> 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 <strong>greater than</strong> the JGit repository size threshold or the job requires git features that are not implemented in JGit, then command line git is used.
 </p>
 <p>

src/main/resources/hudson/plugins/git/GitSCM/help-extensions.html

@@ -21,7 +21,7 @@
         <strong>Tagging extensions</strong> allow the plugin to apply tags in the current workspace.
       </li>
       <li>
-        <strong>Build inititation extensions</strong> control the conditions that start a build.
+        <strong>Build initiation extensions</strong> control the conditions that start a build.
         They can ignore notifications of a change or force a deeper evaluation of the commits when polling.
       </li>
       <li>

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<String> logCaptor = ArgumentCaptor.forClass(String.class);
-        verify(mockListener.getLogger(), atLeastOnce()).println(logCaptor.capture());
-        List<String> values = logCaptor.getAllValues();
-        assertThat(values, hasItem("Commit message: \"test commit\""));
+        rule.waitForMessage("Commit message: \"test commit\"", run);
     }
 
     /**