Merge pull request #71 from Ladyprowess/patch-1

Make a comment more inclusive
jenkinsci · Jul 29, 2022 · ef9c0ba · ef9c0ba
2 parents a24191b + d6dff64
commit ef9c0ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gitserver/FileBackedHttpGitRepository.java b/src/main/java/org/jenkinsci/plugins/gitserver/FileBackedHttpGitRepository.java
@@ -29,14 +29,14 @@
 
 /**
  * Convenient subtype of {@link HttpGitRepository} where the repository
- * is non-bare, resides in a directory local to the master, and you maintain
+ * is non-bare, resides in a directory local to the controller, and you maintain
  * the local up-to-date checkout whenever a change is pushed.
  *
  * @author Kohsuke Kawaguchi
  */
 public abstract class FileBackedHttpGitRepository extends HttpGitRepository {
     /**
-     * Directory of the local workspace on the master.
+     * Directory of the local workspace on the controller.
      * There will be "./.git" that hosts the actual repository.
      */
     public final File workspace;
@@ -133,7 +133,7 @@ public void onPostReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
 
     /**
      * Called when new ref is pushed to update the {@linkplain #workspace local workspace}.
-     * The default implementation does "git reset --hard master"
+     * The default implementation does "git reset --hard main"
      */
     protected void updateWorkspace(Repository repo) throws IOException, GitAPIException {
         ResetCommand cmd = new Git(repo).reset();