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

8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups #38

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Jun 1, 2022

The backport needed some resolving/adaptation to older zipfs code.
Method IndexNode:toString is not implemented, so this part of the upstream patch does not apply.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u pull/38/head:pull/38
$ git checkout pull/38

Update a local copy of the PR:
$ git checkout pull/38
$ git pull https://git.openjdk.java.net/jdk11u pull/38/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 38

View PR using the GUI difftool:
$ git pr show -t 38

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u/pull/38.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 1, 2022

👋 Welcome back clanger! 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 changed the title Backport 80cf9f3464c599fb7860432bf4ed506a3b298d8e 8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups Jun 1, 2022
@openjdk
Copy link

openjdk bot commented Jun 1, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 1, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 1, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Ok, the hunk is omitted, because JDK-8222276 and JDK-8213031 are not in 11u.
I noticed that you are also backporting JDK-8286444 and JDK-8286855.
Makes sense.

@openjdk
Copy link

openjdk bot commented Jun 2, 2022

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

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

8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups

Reviewed-by: mdoerr

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 2 new commits pushed to the master branch:

  • 4546db6: 8240132: ProblemList com/sun/jdi/InvokeHangTest.java
  • 06ead4e: 8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches

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 Pull request is ready to be integrated label Jun 2, 2022
@RealCLanger
Copy link
Contributor Author

GHA failures on Windows are unrelated, Will be fixed with #39

@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

Going to push as commit 9c64a06.
Since your change was applied there have been 5 commits pushed to the master branch:

  • 3f9d731: 8286444: javac errors after JDK-8251329 are not helpful enough to find root cause
  • 54a1784: 8287378: GHA: Update cygwin to fix issues in langtools tests on Windows
  • 3625ce7: 8287739: [11u] ProblemList sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
  • 4546db6: 8240132: ProblemList com/sun/jdi/InvokeHangTest.java
  • 06ead4e: 8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 3, 2022
@openjdk openjdk bot closed this Jun 3, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 3, 2022
@openjdk
Copy link

openjdk bot commented Jun 3, 2022

@RealCLanger Pushed as commit 9c64a06.

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

@RealCLanger RealCLanger deleted the backport-80cf9f34 branch Jun 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants