Skip to content
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

Added new lines to .gitignore. #52615

Merged
merged 1 commit into from Jul 22, 2018

Conversation

Projects
None yet
5 participants
@davidtwco
Copy link
Member

davidtwco commented Jul 22, 2018

There are a handful of files that I often find in my local working directories that I never want to commit that aren't covered in the .gitignore file:

/mir_dump:
Default output location from -Z mir-dump=all for a specific test, I can't think of a reason why this should ever be commited.

tags*/TAGS*:
I use vim-gutentags which outputs tags and tags.temp which I don't want commited. I also collapsed the TAGS, TAGS.vi, TAGS.emacs into TAGS*.

Session.vim:
I use vim-obsession to save my current session in Vim, it outputs a Session.vim file, this also shouldn't be commited.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jul 22, 2018

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

.gitignore Outdated
TAGS.emacs
TAGS.vi
tags*
TAGS*

This comment has been minimized.

@nikomatsakis

nikomatsakis Jul 22, 2018

Contributor

maybe TAGS and TAGS.*? this "open-ended glob" makes me a touch nervous for some silly reason

This comment has been minimized.

@davidtwco

davidtwco Jul 22, 2018

Author Member

Fixed this.

.gitignore Outdated
@@ -69,6 +69,7 @@ __pycache__/
/doc
/inst/
/llvm/
/mir_dump

This comment has been minimized.

@nikomatsakis

nikomatsakis Jul 22, 2018

Contributor

I wind up with mir_dump directories scattered al over (e.g., often in src/test/ui) -- maybe we can make this a more general case? I forget what leading / means though.

This comment has been minimized.

@davidtwco

davidtwco Jul 22, 2018

Author Member

IIRC, the / just makes it match from the root of the repository. I've removed the / so it should match anywhere in the tree.

.gitignore Outdated
\#*
\#*\#
config.mk
config.stamp
keywords.md
lexer.ml
Session.vim

This comment has been minimized.

@nikomatsakis

nikomatsakis Jul 22, 2018

Contributor

It might make sense to add this to your personal ~/.gitignore (that is where I have e.g. *~, which rules out emacs backup files). But I don't really mind putting it here also.

This comment has been minimized.

@davidtwco

davidtwco Jul 22, 2018

Author Member

I'll do that, I forgot that's a thing you could do. I'll leave it here though because it doesn't hurt.

@davidtwco davidtwco force-pushed the davidtwco:add-to-gitignore branch from 8f7aa99 to c645ecd Jul 22, 2018

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Jul 22, 2018

@bors r=nikomatsakis,Mark-Simulacrum rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jul 22, 2018

📌 Commit c645ecd has been approved by nikomatsakis,Mark-Simulacrum

kennytm added a commit to kennytm/rust that referenced this pull request Jul 22, 2018

Rollup merge of rust-lang#52615 - davidtwco:add-to-gitignore, r=nikom…
…atsakis,Mark-Simulacrum

Added new lines to .gitignore.

There are a handful of files that I often find in my local working directories that I never want to commit that aren't covered in the `.gitignore` file:

`/mir_dump`:
Default output location from `-Z mir-dump=all` for a specific test, I can't think of a reason why this should ever be commited.

`tags*`/`TAGS*`:
I use `vim-gutentags` which outputs `tags` and `tags.temp` which I don't want commited. I also collapsed the `TAGS`, `TAGS.vi`, `TAGS.emacs` into `TAGS*`.

`Session.vim`:
I use `vim-obsession` to save my current session in Vim, it outputs a `Session.vim` file, this also shouldn't be commited.

bors added a commit that referenced this pull request Jul 22, 2018

Auto merge of #52616 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #51807 (Deprecation of str::slice_unchecked(_mut))
 - #52465 (Add CI test harness for `thumb*` targets. [IRR-2018-embedded])
 - #52507 (Reword when `_` couldn't be inferred)
 - #52508 (Document that Unique::empty() and NonNull::dangling() aren't sentinel values)
 - #52521 (Fix links in rustdoc book.)
 - #52558 (Add tests for ICEs which no longer repro)
 - #52581 (Avoid using `#[macro_export]` for documenting builtin macros)
 - #52582 (Typo)
 - #52587 (Add missing backtick in UniversalRegions doc comment)
 - #52594 (Run the error index tool against the sysroot libdir)
 - #52615 (Added new lines to .gitignore.)

Failed merges:

r? @ghost

kennytm added a commit to kennytm/rust that referenced this pull request Jul 22, 2018

Rollup merge of rust-lang#52615 - davidtwco:add-to-gitignore, r=nikom…
…atsakis,Mark-Simulacrum

Added new lines to .gitignore.

There are a handful of files that I often find in my local working directories that I never want to commit that aren't covered in the `.gitignore` file:

`/mir_dump`:
Default output location from `-Z mir-dump=all` for a specific test, I can't think of a reason why this should ever be commited.

`tags*`/`TAGS*`:
I use `vim-gutentags` which outputs `tags` and `tags.temp` which I don't want commited. I also collapsed the `TAGS`, `TAGS.vi`, `TAGS.emacs` into `TAGS*`.

`Session.vim`:
I use `vim-obsession` to save my current session in Vim, it outputs a `Session.vim` file, this also shouldn't be commited.

bors added a commit that referenced this pull request Jul 22, 2018

Auto merge of #52616 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #51807 (Deprecation of str::slice_unchecked(_mut))
 - #52051 (mem::swap the obvious way for types smaller than the SIMD optimization's block size)
 - #52465 (Add CI test harness for `thumb*` targets. [IRR-2018-embedded])
 - #52507 (Reword when `_` couldn't be inferred)
 - #52508 (Document that Unique::empty() and NonNull::dangling() aren't sentinel values)
 - #52521 (Fix links in rustdoc book.)
 - #52581 (Avoid using `#[macro_export]` for documenting builtin macros)
 - #52582 (Typo)
 - #52587 (Add missing backtick in UniversalRegions doc comment)
 - #52594 (Run the error index tool against the sysroot libdir)
 - #52615 (Added new lines to .gitignore.)

@bors bors merged commit c645ecd into rust-lang:master Jul 22, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@davidtwco davidtwco deleted the davidtwco:add-to-gitignore branch Jul 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.