Files that have been moved in ClearCase will loose their history. about git-cc

[charleso]

Git doesn't track renames. Period. Instead you can ask Git to calculate renames based on the content changes.

Have you tried running 'git log -M --name-status', 'git log --follow $FILE' or 'git diff -M' to force git to tell you about renames?

[nesqi]

I see that I was incorrect in stating that all moved files will loose their history. In some cases it will actually work.

It's correct that git only tracks changes, however this is only done if the add and remove is in the same git commit. A file movement in ClearCase constitutes of 2 directory changes.

1. the file is unlinked from the source directory
2. the file is added to the new directory.

If for some reason gitcc does not commit these changes in the same git-commit the history for the file will be lost. It is not unlikely that the commits will be split between different commits. Even though the commit message is the same for both source and dest dir commits in clearcase (which it might not be) there must be NO OTHER commits in between.

So if one user updates a file and another user changes the name of a file (in clearcase), history might be lost for the file in the conversion.

[charleso]

Ahh, yes. Good point. Yes, that's a much harder problem to solve - "detecting" property atomic commits (which of course don't actually exist in Clearcase). My current logic, as you've discovered, is naive in the extreme.

If you're only doing this as a once off import, my personal opinion is to use the power of 'git filter-branch' after you have all the history. Doing these sorts of operations in Git is trivial and extremely quick, assuming you can manually detect/mark these sorts of cases (see below).

Feel free to create another issue for this if you like, although sadly I personally won't be working on it due to reasons stated earlier (I don't use Clearcase any more).

PS You can run "git log -C -C -C" etc to detect renames across commits. It's slow downs as you add more C's of course...