Skip to content

/ servo

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.

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

Ignore VSCode IDE files #23686

Merged
merged 1 commit into from Sep 25, 2019
Merged

Ignore VSCode IDE files #23686

merged 1 commit into from Sep 25, 2019

Conversation

@saschanaz
Copy link
Contributor

saschanaz commented Jul 2, 2019 •
edited by SimonSapin

This ignores launch.json (to configure debugger) and ipch/ (for IntelliSense).

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #___ (GitHub issue number if applicable)
  • These changes do not require tests because it only changes gitignore.

This change is Reviewable
@SimonSapin
Copy link
Member

SimonSapin commented Jul 2, 2019

Why not ignore all of .vscode/ ?
@saschanaz
Copy link
Contributor Author

saschanaz commented Jul 2, 2019

AFAIK ipch/ is just a cache, and we don't have a launch.json (Do we want to create and maintain this?)
@saschanaz
Copy link
Contributor Author

saschanaz commented Jul 2, 2019

Why not ignore all of .vscode/ ?

Because we have extensions.json? Maybe I can do !/.vscode/extensions.json
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2019

☔ The latest upstream changes (presumably #23696) made this pull request unmergeable. Please resolve the merge conflicts.
@saschanaz saschanaz force-pushed the saschanaz:git-ignore branch from 87a034d to bdc653c Jul 4, 2019
@saschanaz
Ignore VSCode IDE files
Loading status checks…
80ac5bb
@saschanaz saschanaz force-pushed the saschanaz:git-ignore branch from bdc653c to 80ac5bb Jul 4, 2019
@saschanaz
Copy link
Contributor Author

saschanaz commented Sep 25, 2019

@jdm Could you review this? Currently I have to consciously ignore those files when I commit 🤔
@jdm
Copy link
Member

jdm commented Sep 25, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2019

📌 Commit 80ac5bb has been approved by jdm
@highfive highfive assigned jdm and unassigned SimonSapin Sep 25, 2019
@SimonSapin
Copy link
Member

SimonSapin commented Sep 25, 2019

I have to consciously ignore those files

For what it’s worth you can also use the local-clone-only ignore file at .git/info/exclude
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2019

⌛ Testing commit 80ac5bb with merge a1c911f...
bors-servo added a commit that referenced this pull request Sep 25, 2019
@bors-servo
Auto merge of #23686 - saschanaz:git-ignore, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a1c911f 
Ignore VSCode IDE files

<!-- Please describe your changes on the following line: -->

This ignores launch.json (to configure debugger) and `ipch/` (for IntelliSense).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] These changes do not require tests because it only changes gitignore.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23686)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing a1c911f to master...
@bors-servo bors-servo merged commit 80ac5bb into servo:master Sep 25, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@saschanaz @SimonSapin @bors-servo @jdm @highfive
You can’t perform that action at this time.