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.

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

913: Skara should honor .gitconfig and /etc/gitconfig #1049

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 11, 2021

In SKARA-868, the fix to ignore .gitconfig and /etc/gitconfig was applied universally, which is causing trouble for users. The intention from the filer was to just disable this when running the Skara tests. I still think we should have a way to ignore gitconfig when running tests, but we need to keep honoring the git configuration at runtime.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-913: Skara should honor .gitconfig and /etc/gitconfig

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/1049/head:pull/1049
$ git checkout pull/1049

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 11, 2021

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Mar 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 11, 2021

Webrevs

private final Path dir;
private final Logger log = Logger.getLogger("org.openjdk.skara.vcs.git");
private Path cachedRoot = null;
private static final Hash EMPTY_TREE = new Hash("4b825dc642cb6eb9a060e54bf8d69288fbee4904");

public static void ignoreUserConfiguration(boolean ignore) {
Copy link
Member

@edvbld edvbld Mar 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably have named the method ignoreConfiguration and skipped the boolean ignore parameter. It doesn't seem like we ever pass false to ignoreUserConfiguration. If we need it in then in the future then we can add a method like enableConfiguration.

edvbld
edvbld approved these changes Mar 11, 2021
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 11, 2021

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

913: Skara should honor .gitconfig and /etc/gitconfig

Reviewed-by: ehelin

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • fd80e0a: forge: add HostedRepository.restrictPushAccess

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Mar 11, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Mar 11, 2021

/integrate

@openjdk openjdk bot closed this Mar 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 11, 2021

@magicus Since your change was applied there has been 1 commit pushed to the master branch:

  • fd80e0a: forge: add HostedRepository.restrictPushAccess

Your commit was automatically rebased without conflicts.

Pushed as commit dbef34b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the fix-ignoring-gitconfig branch Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants