Question

I have a linked assembly file in an eclipse project (Code composer studio v5.3). The file has only been edited once since it was added to the project months ago, yet the file is constantly marked as dirty and shown in the unstaged changes pane of the Git Repository perspective.

If I try a commit of just this file I get an error that there are no changes.

If it gets listed as part of a commit with other files then the commit runs OK, but the asm file is not actually committed.

I have tried git status from git bash on the project and it does not list the asm file

I have tried setting it to assume unchanged but nothing happens...

I have other linked files of various types (.asm, .c, .cmd, etc) in the project that do not suffer the same problem...

How can I find out what is causing this and solve it?

PS: Bear in mind I'm a total n00b at git, am only able to use it thus far as EGit removes the need for me to learn and recall all the ins & outs of CLI commands etc!

Was it helpful?

Solution

The update to EGit v2.3 did solve some other annoyances I had been seeing. But looking at the repo using Git Extensions I realised I had a copy of the linked file sitting in the repo directory - essentially duplicating the file in the project (i.e. there was a copy of the asm file in the project dir BUT the project settings was telling the project to also go link to the same asm file at another location).

I figured this might be snarling up the .project file somehow so I removed the link from the project, rebuilt and sure enough the file from the project dir was added to the project. The subsequent commit and push ran OK!

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top