6

So I can do something like this: Stop tracking files in git (without deleting them)

But this only affects my git.

There are some default settings file that is already tracked in the remote repository, how do I remove the tracking on that file without deleting the files? I don't want to remove it from the remote repository but that file is necessary to run the application, so anyone doing fresh install needs that file, so they should have that file when they do git clone.

But for development, anyone of the devs can make changes to the files, but those changes SHOULD NEVER be tracked, only the default value should persist in the remote repository.

I tried adding the files to .gitignore list, but it doesn't work - because it's already being tracked, I assume? I would like for everyone to have that file, but everyone should not be able to make changes to the file.

So how do I do this?

Farid
  • 872
  • 1
  • 13
  • 30
  • Put it in the .gitignore file, and check in the .gitignore file? – Grady Player Apr 25 '18 at 02:09
  • I did that, but it seems like the changes is still there, I assume this is because git already tracks them? – Farid Apr 25 '18 at 02:12
  • The file will be there, further changes will be ignored, if you need to remove a file you will need to git remove it also. – Grady Player Apr 25 '18 at 02:46
  • Add files to .gitignore, commit and push to remote repo, then execute `git update-index --assume-unchanged` in `git-hook`, which can be triggered while `git clone` or `git checkout`. – Corey Apr 25 '18 at 10:13

1 Answers1

1

how do I remove the tracking on that file without deleting the files? 

git rm --cached -- afileToIgnore

It will be removed from Git index, but will remain on the disk locally.

If that file is then added to .gitignore, a git status won't show it anymore to be added/changed.

However, that would record the file as being deleted from the Git repo, which is not what you want.

So the actual solution is to then add that same file as a template

 copy aFileToIgnore aFileToIgnre.tpl
 git add aFileToIgnre.tpl
 git commit -m "record template value file"

And then declare a smudge content filter driver which, automatically, will re-generate that file (ignored, since it is in .gitignore)

https://git-scm.com/book/en/v2/images/smudge.png

smudge script (which you can version)

copy aFileToIgnore.tpl aFileToIgnre

See also "How can I track system-specific config files in a repo/project?"

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250