Closed Bug 1484708 Opened Last year Closed Last year

.gitignore rules are incorrect

Categories

(Firefox Build System :: Developer Environment Integration, enhancement)

enhancement
Not set

Tracking

(firefox63 fixed)

RESOLVED FIXED
mozilla63
Tracking Status
firefox63 --- fixed

People

(Reporter: khyperia, Assigned: khyperia)

Details

Attachments

(1 file, 2 obsolete files)

Merging two issues into one, because they're quite minor updates to .gitignore:

.hgignore includes the following lines:

# Build directories for js shell
_DBG\.OBJ/
_OPT\.OBJ/
^js/src/.*-obj/

.gitignore includes the following lines:

# Build directories for js shell
_DBG.OBJ/
_OPT.OBJ/

The .gitignore lines *should* be `*_DBG.OBJ/` (asterisk in front), as .gitignore syntax matches the entire file/folder name, and so needs a glob up front. Right now, it only matches literally `_DBG.OBJ`, and not e.g. `build_DBG.OBJ`.

Additionally, .gitignore includes `.vscode/*`. This should be `.vscode/` (no asterisk), since the current rule means "exclude all files within .vscode, but *include* the .vscode folder *itself*". This isn't a problem with the root .vscode, but if there's a .vscode elsewhere in tree (in my case, `js/src/.vscode`), git will want to add the folder (but no files within it).

(Note there's already reverse-excludes(?) for `.vscode/extensions.json` and `.vscode/tasks.json`)
Attached patch Update .gitignore rules. (obsolete) — Splinter Review
Assignee: nobody → khyperia
Status: NEW → ASSIGNED
Attachment #9002473 - Flags: review?(ted)
Would be nice to include obj-* for js/src too. I think this convention is used for the project root ignores.
Attached patch Update .gitignore rules. (obsolete) — Splinter Review
Attachment #9002473 - Attachment is obsolete: true
Attachment #9002473 - Flags: review?(ted)
Attachment #9002504 - Flags: review?(ted)
(In reply to Ted Campbell [:tcampbell] from comment #2)
> Would be nice to include obj-* for js/src too. I think this convention is
> used for the project root ignores.

(it's *-obj - the .hgignore is `^js/src/.*-obj/`. Attached new patch that adds `/js/src/**/*-obj/`)
Attachment #9002504 - Attachment is obsolete: true
Attachment #9002504 - Flags: review?(ted)
Cool. This covers the cases I was thinking of :)
Attachment #9002517 - Flags: review?(ted)
Comment on attachment 9002517 [details] [diff] [review]
Update .gitignore rules and add js/src/obj-*.

Review of attachment 9002517 [details] [diff] [review]:
-----------------------------------------------------------------

It's so fun when two tools use similar-looking patterns that are actually different. :) Thanks for fixing this up!
Attachment #9002517 - Flags: review?(ted) → review+
Also FYI: in the future you might want to request review from :build-peer , which is the shared review queue for build peers. If you don't need review from a specific person it's usually faster (we triage it at our team meeting every week).
Keywords: checkin-needed
(In reply to Ted Mielczarek [:ted] [:ted.mielczarek] from comment #8)
> Also FYI: in the future you might want to request review from :build-peer ,
> which is the shared review queue for build peers. If you don't need review
> from a specific person it's usually faster (we triage it at our team meeting
> every week).

Thanks! I appreciate the info :)
Pushed by dluca@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/ead8943575c9
Update .gitignore rules and add js/src/obj-*. r=ted.mielczarek
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/ead8943575c9
Status: ASSIGNED → RESOLVED
Closed: Last year
Resolution: --- → FIXED
Target Milestone: --- → mozilla63
You need to log in before you can comment on or make changes to this bug.