You are here

main/source/external/boost_1_55_0/boost/bimap/tags/ being ignored by git

5 posts / 0 new
Last post
main/source/external/boost_1_55_0/boost/bimap/tags/ being ignored by git


I'm using git for version control while developing some additional score terms for internal use. We are not official developers, so I can't clone the official repo, so I just downloaded the source I need (2017.08), and ran the following to get a starting point for my development:

git init
git add .
git commit -m '2017.08'

However, what I noticed is that 'main/source/external/boost_1_55_0/boost/bimap/tags/' gets ignored by git durring commit and checkout, and leads to compilation failure when attempting to build. Is there a particular reason this folder is ignored by git? How do you guys get around this file not being tracked by git?

Post Situation: 
Thu, 2017-04-20 14:30

Proable guess as to what's happening:

A) Rosetta was developed in SVN for years

B) boost got added at some point, including that folder

C) Rosetta moved to git, via a gitsvn conversion; this folder came along for the ride

D) .gitignore got added, including "tags", because that gets used with etags or ctags or whatever (it's an IDE thingie in emacs); git now ignored files matching this pattern (although never this actual folder, since it was already known to git)

E) nobody ever touches the boost code because it's not ours and not safe to touch, and since it's already IN the repository, it stays there as a file you can check out

F) when you git added existing rosetta to a new repo, the .gitignore was already present (whereas for us it came AFTER the git conversion), so it made git ignore those files.

So, the problem is in order-of-operations, or poorly chosen entries in .gitignore, or both.  The solution is either manually add those files, or remove the .gitignore when making the initial repository, or maybe just slim .gitignore down.

The short answer is "this is a problem of a git init repository, but not for the real rosetta repository".

Thu, 2017-04-20 14:58

Ahh, yes. OK. That summary makes sense. I'm still rather new to using git, so I forgot that it was possible to manualy add files to the repo that are in .gitignore . Thanks!

Thu, 2017-04-20 16:05

You can always overcome git ignoring a file by deliberately adding it (e.g. with `git add`, explicitly specifying the otherwise ignored file/directory ). In our repo we've deliberately added it, so git tracks it just fine.  

The reason why git is ignoing that directory is probably related to us having various forms of "tags" in the main/source/.gitignore file. When you created a new repository and run 'git add .', git recognized the 'tags' designation in the gitignore file, and didn't bother to auto-add that directory.

Note that you can see which files/directories are being ignored by git with the `git status --ignored` command, and then add them manually/explicitly.

P.S. Feel free to use git to keep track of your modifications on your local machine or privately within your group. But do keep in mind that the terms of the Rosetta license means that you shouldn't ever re-distribute the RosettaCommons-distributed source code. This would include putting the git repository you generated onto a publically-accessible  repository server (e.g. GitHub and the like), even if you only intend it for your personal use.

Thu, 2017-04-20 15:01

Thanks - forgot that .gitignore doesn't apply to files manually added to the repo...

And thanks for the reditribution reminder. No worries, we'll be careful not to put it anywhere publically accessable. :-)

Thu, 2017-04-20 16:08