8382090: Remove .rej and .orig from .gitignore

[Domest0s]

Keeping .rej and .orig files visible to the developer is important. It helps minimizing human error when moving or applying source code changes.

---

• I confirm that I make this contribution in accordance with the OpenJDK Interim AI Policy.

---

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-8382090: Remove .rej and .orig from .gitignore (Bug - P4)

Reviewers

• Alexey Ivanov (@aivanov-jdk - Reviewer)
• Erik Joelsson (@erikj79 - Reviewer)
• SendaoYan (@sendaoYan - Committer)
• Chen Liang (@liach - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30772/head:pull/30772
$ git checkout pull/30772

Update a local copy of the PR:
$ git checkout pull/30772
$ git pull https://git.openjdk.org/jdk.git pull/30772/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30772

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30772.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back Domest0s! 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]

@Domest0s 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.

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

8382090: Remove .rej and .orig from .gitignore

Reviewed-by: aivanov, erikj, syan, liach

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

• 0dd0108: 8377936: VoiceOver Reads Button Incorrectly
• 804ecc1: 8382436: Build failures after JDK-8326205
• 2325c36: 8378891: Problemlist TestStaticCallStub on Windows AArch64
• ... and 26 more: https://git.openjdk.org/jdk/compare/35ad47b4c09d0812f3f7c57ac7932c1533790fc1...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@aivanov-jdk, @erikj79, @sendaoYan, @liach) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

@Domest0s The following label will be automatically applied to this pull request:

• build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (61bddb69)

[aivanov-jdk]

Looks good to me.

I agree that seeing .rej and .orig files is important, especially in update releases. If a patch doesn't apply cleanly, the .rej files provide crucial information about the conflicts.

These file types were added to .gitignore in #25474 (JDK-8357920) to prevent them from being committed into the repo. Yet I think seeing both .rej and .orig in the output of git status outweighs rare occasions when these files could accidentally be committed.

SKARA-2514 will ensure .rej and .orig can't be committed.

[Domest0s]

@erikj79 @aivanov-jdk Thank you for the review.

[Domest0s]

/integrate

[openjdk]

@Domest0s
Your change (at version 61bddb6) is now ready to be sponsored by a Committer.

[sendaoYan]

/sponsor

[openjdk]

Going to push as commit 35f623b.
Since your change was applied there have been 32 commits pushed to the master branch:

• 8d79d47: 8382391: Cleanup unnecessary storestore() in stringStream::as_string
• 35b0de3: 8382043: Add missing @OverRide annotations in "javax.print.attribute" package
• d71f070: 8382368: Warning that @deprecated "has no effect" is suppressed by @deprecated
• ... and 29 more: https://git.openjdk.org/jdk/compare/35ad47b4c09d0812f3f7c57ac7932c1533790fc1...master

Your commit was automatically rebased without conflicts.

[openjdk]

@sendaoYan @Domest0s Pushed as commit 35f623b.

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