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

398: git webrev cannot handle a file named index.html #619

Closed
wants to merge 2 commits into from

Conversation

@rwestberg
Copy link
Member

@rwestberg rwestberg commented May 11, 2020

Hi all,

Please review this change that allows git webrev to generate webrevs even if the commit contains a file named index.html (which would previously conflict with the generated index.html that belongs to the webrev itself).

Best regards,
Robin


Progress

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

Issue

  • SKARA-398: git webrev cannot handle a file named index.html

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 11, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@openjdk openjdk bot added the rfr label May 11, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 11, 2020

Webrevs

@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented May 11, 2020

Looks like the test fails on Windows, will take a look.

@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

398: git webrev cannot handle a file named index.html

Reviewed-by: jvernee
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 9573e7981f0dd16c308067fb192cb3c5dd4fa2c6.

➡️ 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 May 11, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented May 11, 2020

/integrate

@openjdk openjdk bot closed this May 11, 2020
@openjdk openjdk bot added integrated and removed ready labels May 11, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2020

@rwestberg
Pushed as commit 6b6952e.

@openjdk openjdk bot removed the rfr label May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants