How do you deal with file ownership in git?

Question

I'm working on an embedded Linux project. Our build process makes an image that gets flashed to a device. Many of our files require root ownership for the system to work correctly. I ran into a problem when I tried to pull and some of those files were modified - git couldn't write those files, so did reset hard and did sudo pull. Then when I switched branches, it said "unable to unlink..." for all those files, but it switched branches anyway, then when I tried to switch back to the branch it wouldn't let me because I had local changes.

So I'm not doing something right; what is the correct way to deal with this?

Answer 1

I would structure your system so that the source files don't care what owner they are. You can check these in and out of git without worrying what permissions they have or who the owner is (especially since "owner" isn't meaningful across all the systems a git deployment is likely to serve).

When you want to generate the embedded image, copy everything to a new directory and then set the permissions as you need.

Answer 2

To build on Karmastan's answer, the magic words here are "build script".

Files in git don't have to look like the deployment versions. You don't deploy .c files -- you compile them first. Likewise some config files can go through a build process before being deployed/installed, also.

Answer 3

The easiest way (if it's possible) would be to not do any operations (cloning etc) as root, because that leads to the other user not being able to work with the files.

An alternative would be using git init --shared to set up shared (group or all) permissions for the repository, followed by a git remote add origin http://host/repo.git and a git pull origin master. Which is basically a clone with less strict permissions.