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

Set ignore = untracked on IPOPT, since its own .gitignore is not comprehensive. #2579

Merged
merged 1 commit into from
Jun 20, 2016

Conversation

david-german-tri
Copy link
Contributor

@david-german-tri david-german-tri commented Jun 17, 2016

This will prevent modified: externals/ipopt (untracked content) from appearing in git status after you compile post #2487.

@bradking, @sammy-tri, @amcastro-tri FYI

@ggould-tri for feature and platform review


This change is Reviewable

@sammy-tri
Copy link
Contributor

:lgtm:


Review status: 0 of 1 files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@ggould-tri
Copy link
Contributor

Ugh.
:lgtm:


Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@bradking
Copy link
Contributor

Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks pending.


.gitmodules, line 91 [r1] (raw file):

  path = externals/ipopt
  url = https://github.com/RobotLocomotion/ipopt-mirror.git
  ignore = dirty        

I think this should be set to untracked instead of dirty. We don't care about untracked content that is not mentioned in .gitignore but we do care about changes to the tracked files as local modifications.


Comments from Reviewable

@david-german-tri
Copy link
Contributor Author

Review status: 0 of 1 files reviewed at latest revision, all discussions resolved, some commit checks pending.


.gitmodules, line 91 [r1] (raw file):

Previously, bradking (Brad King) wrote…

I think this should be set to untracked instead of dirty. We don't care about untracked content that is not mentioned in .gitignore but we do care about changes to the tracked files as local modifications.

Done.

Comments from Reviewable

@david-german-tri david-german-tri changed the title Set ignore = dirty on IPOPT, since its own .gitignore is not comprehensive. Set ignore = untracked on IPOPT, since its own .gitignore is not comprehensive. Jun 17, 2016
@bradking
Copy link
Contributor

:lgtm:


Reviewed 1 of 1 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks pending.


Comments from Reviewable

@david-german-tri david-german-tri merged commit 6b3655d into RobotLocomotion:master Jun 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants