From: pbegeland Date: Tue, 10 Apr 2012 18:16:14 GMT Subject: dirty commits: cause? how to prevent them? Message-ID: <4a0ed0da5e2c0fdc4e94a96f188ad60b@linea.gov.br> Hi, I have a git superproject with a number of git submodules. Developers of those git submodules are recently reporting some problems though when using them. They noticed some modified or untracked files which are preventing them from pulling or committing changes of their own. The system where the clones are as well as the central repositories, have 2 different versions of git: 1.6.5 and 1.7.4.1. Looking at the clone of the developers who reported me the problems, I do see dirty commits when doing a "git diff". By doing some search today at the net, I realized that there is something in particular with v. 1.7.0 and later where the superproject will display submodules as being modified when they contain untracked or modified files, even if the compared ref matches the HEAD of the submodule. And, commits will be marked as dirty. Do you think the problems are caused by the use of version 1.7.4.1? I'm trying to reproduce the problems as I wonder why only now such a thing happened. (I've never observed dirty commits before) What is most strange to me is that doing a "git status" with version 1.6.5, submodules are also reported as being modified in one of the clones of those develoepers. By reproducing the problem, I expect I have a clue why this started happening only now. I also need to check how to have the developers clones cleaned. In a superproject tree of one of them, a "git pull" is denied as it says to him that he is in the middle of a conflicted merge. I'm not confident of giving any suggestion to developers at the moment on how to have their clones cleaned since I don't understand well what is going on. If you have any suggestion or recommendation, pls let me know. (perhaps you need more details on my part for that...) Thanks, Patricia