RFR: 8357920: Add .rej and .orig to .gitignore
Magnus Ihse Bursie
ihse at openjdk.org
Wed May 28 09:22:56 UTC 2025
On Wed, 28 May 2025 02:00:41 GMT, SendaoYan <syan at openjdk.org> wrote:
>> The file types .rej and .orig are often created by diff tools. Adding them to .gitignore will help people from mistakenly committing these files.
>>
>> See https://github.com/openjdk/jdk/pull/25306#discussion_r2102407122 for an example of where this happened.
>
> .gitignore line 26:
>
>> 24: /.lldbinit
>> 25: **/core.[0-9]*
>> 26: *.rej
>
> 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
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`.
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/25474#discussion_r2111368739
More information about the build-dev
mailing list