Skip to content

8357920: Add .rej and .orig to .gitignore #25474

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.

Sign up for GitHub

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

Closed
magicus wants to merge 1 commit into from
Closed

8357920: Add .rej and .orig to .gitignore #25474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ NashornProfile.txt
/.gdbinit
/.lldbinit
**/core.[0-9]*
*.rej
Copy link
Member

@sendaoYan sendaoYan May 28, 2025

Choose a reason for hiding this comment

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

How about use below config instead. It will ignore all the related diff files in root directory and in the any sub-directory.

**/*.rej
**/*.orig

Copy link
Member Author

@magicus magicus May 28, 2025

Choose a reason for hiding this comment

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

Patterns without a / in them will match in all subdirectories, so your suggestion is just redundant. I see we have some places where this was done previously; maybe we should remove that to avoid the confusion. ** is only relevant if you want to do something like src/**/*.java.

Copy link
Member Author

@magicus magicus May 28, 2025

Choose a reason for hiding this comment

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

And if you really wanted to just match files in the root directory, you'd have to write /*.rej.

*.orig