How can I rewrite history so that all files, except the ones I already moved, are in a subdirectory?
I have a project under git . One day I moved all project files from current directory to foo/bar/ under the project. I did it using git mv . Then I added some more files and did some changes to already existing files.
As a result, now when I look at the history of foo/bar/file.c , I can only see changes that I did after I moved the file.
I tried to fix this in various ways ( filter-branch with subdirectory filter, etc), but nothing helped, so I am pretty stacked here. I'll appreciate any help that you can give me. Thanks!
To rewrite the history with the files moved:
If you want the project's history to look as though all files have always been in the directory foo/bar , then you need to do a little surgery. Use git filter-branch with the "tree filter" to rewrite the commits so that anywhere foo/bar doesn't exist, it is created and all files are moved to it:
git filter-branch --prune-empty --tree-filter '
if [ ! -e foo/bar ]; then
mkdir -p foo/bar
git ls-tree --name-only $GIT_COMMIT | xargs -I files mv files foo/bar
fi'
Now the history will be recorded as if all files were always located in foo/bar .
To see the history of a moved file:
If you just want to see the history of a file that has been moved or renamed at some point in the past, then simply use the --follow option to git log :
git log --follow foo/bar/file.c
To wrap things up here's a short summary of what I did. The command that worked for me was:
if [ ! -e foo/bar ]; then mkdir -p foo/bar; git ls-tree --name-only $GIT_COMMIT | grep -v ^foo$ | xargs -I files mv files foo/bar || echo ""; fi
The echo command that I added at the end ensured that even when mv fails entire command will continue running. It didn't move contents of foo/bar/foo, but I can live with that.
Thanks a lot to Dan Moulding (!!!) and Jefromi for the help.
链接地址: http://www.djcxy.com/p/46972.html