Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make a comment more inclusive #71

Merged
merged 2 commits into from Jul 29, 2022
Merged

Make a comment more inclusive #71

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355f0d6
Make a comment more inclusive
Ladyprowess May 8, 2022
d6dff64
Update src/main/java/org/jenkinsci/plugins/gitserver/FileBackedHttpGi…
Ladyprowess May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/gitserver/FileBackedHttpGitRepository.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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 controller"
Ladyprowess marked this conversation as resolved.
Show resolved Hide resolved
*/
protected void updateWorkspace(Repository repo) throws IOException, GitAPIException {
ResetCommand cmd = new Git(repo).reset();
Expand Down