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

8241768: git needs .gitattributes #176

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 2, 2021

Hi all,

this pull request contains a backport of JDK-8241768 from the openjdk/jdk repository.

The commit being backported was authored by Magnus Ihse Bursie on 3 Sep 2020 and was reviewed by Erik Joelsson, Jorn Vernee and Erik Helin.

We need it as a prerequisite to enable GitHub actions in 11u.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 176

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 2, 2021

👋 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 49a9d49dbdb1d17aa4e6b808de6249be543961ea 8241768: git needs .gitattributes Aug 2, 2021
@openjdk
Copy link

openjdk bot commented Aug 2, 2021

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

@openjdk
Copy link

openjdk bot commented Aug 2, 2021

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

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

8241768: git needs .gitattributes

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

  • 351cb48: 8225583: Examine the HttpResponse.BodySubscribers for null handling and multiple subscriptions
  • 8ae2846: 8232243: Wrong caret position in JTextPane on Windows with a screen resolution > 100%
  • a2af649: 8268775: Password is being converted to String in AccessibleJPasswordField
  • 7639f8c: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • 0e2d915: 8257620: Do not use objc_msgSend_stret to get macOS version
  • 6e60332: 8269795: C2: Out of bounds array load floats above its range check in loop peeling resulting in SEGV
  • 69697b3: 8208363: test/jdk/java/lang/Package/PackageFromManifest.java missing module dependencies declaration
  • 95c94ae: 8209773: Refactor shell test javax/naming/module/basic.sh to java
  • d7e852c: 8209930: Refactor java/util/zip/ZipFile/deletetempjar.sh to plain java test
  • bb15820: 8042902: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails intermittently
  • ... and 132 more: https://git.openjdk.java.net/jdk11u-dev/compare/f55ef1e033a769101e383792c3964da275fd4582...master

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 ready rfr labels Aug 2, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 2, 2021

Webrevs

@RealCLanger
Copy link
Contributor Author

RealCLanger commented Aug 2, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Aug 2, 2021

Going to push as commit 37bc75b.
Since your change was applied there have been 142 commits pushed to the master branch:

  • 351cb48: 8225583: Examine the HttpResponse.BodySubscribers for null handling and multiple subscriptions
  • 8ae2846: 8232243: Wrong caret position in JTextPane on Windows with a screen resolution > 100%
  • a2af649: 8268775: Password is being converted to String in AccessibleJPasswordField
  • 7639f8c: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • 0e2d915: 8257620: Do not use objc_msgSend_stret to get macOS version
  • 6e60332: 8269795: C2: Out of bounds array load floats above its range check in loop peeling resulting in SEGV
  • 69697b3: 8208363: test/jdk/java/lang/Package/PackageFromManifest.java missing module dependencies declaration
  • 95c94ae: 8209773: Refactor shell test javax/naming/module/basic.sh to java
  • d7e852c: 8209930: Refactor java/util/zip/ZipFile/deletetempjar.sh to plain java test
  • bb15820: 8042902: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails intermittently
  • ... and 132 more: https://git.openjdk.java.net/jdk11u-dev/compare/f55ef1e033a769101e383792c3964da275fd4582...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 2, 2021

@RealCLanger Pushed as commit 37bc75b.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant