Differential D34254

.gitignore: remove .orig/.rej
Needs RevisionPublic
Actions

Authored by melifaro on Feb 11 2022, 8:04 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sat, Mar 30, 11:49 PM

	Unknown Object (File)
	Feb 14 2024, 7:29 AM

	Unknown Object (File)
	Feb 11 2024, 6:35 PM

	Unknown Object (File)
	Dec 23 2023, 12:15 AM

	Unknown Object (File)
	Dec 13 2023, 4:45 PM

	Unknown Object (File)
	Dec 12 2023, 12:09 PM

	Unknown Object (File)
	Nov 28 2023, 4:01 AM

	Unknown Object (File)
	Nov 22 2023, 11:19 AM

View All 31 Files

Subscribers

Details

Reviewers

avg
cem
gallatin
royger
imp
lwhsu
philip

Summary

Records to ignore .orig/.rej were added in b1f7154cb125.
It turns out that some currently-used developer workflows rely on git reporting .rej files after the merges.
As there is no easy is no easy way to override project .gitignore files locally, remove these records from our .gitignore.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 44418
Build 41306: arc lint + arc unit

Event Timeline

melifaro created this revision.Feb 11 2022, 8:04 PM

Herald added a subscriber: imp. · View Herald TranscriptFeb 11 2022, 8:04 PM

melifaro requested review of this revision.Feb 11 2022, 8:04 PM

Harbormaster completed remote builds in B44418: Diff 102678.Feb 11 2022, 8:04 PM

melifaro edited the summary of this revision. (Show Details)Feb 11 2022, 8:09 PM

melifaro added reviewers: avg, cem, gallatin, royger, imp, lwhsu, philip.

Thank you!

This revision is now accepted and ready to land.Feb 11 2022, 9:23 PM

What workflow?

This revision now requires changes to proceed.Feb 11 2022, 10:53 PM

I don't mind this change either way but I also wonder what kind of workflows need Git to report .orig/.rej.

The workflow I'm referring to is easily cleaning up after applying patches with git clean, using standard arguments.

Revision Contents
Changeset List

Path

Size

2 lines

Diff 102678

.gitignore

Loading...