#BETTER FILE RENAME FOR ANDROID UPDATE#
#BETTER FILE RENAME FOR ANDROID FULL#
#BETTER FILE RENAME FOR ANDROID SOFTWARE#

(Merged by Junio C Hamano - gitster - in commit 0ce5a69, ) No (8 years later, Git 2.19, Q3 2018), because Git will detect the directory rename, and this is now better documented. If I use a plain git mv project components, then all the commit history for the xyz project gets lost. I would like to rename/move a project subtree in Git moving it from /project/xyz The if will avoid the creation of this folder earlier in history than your file exists. You feel like a ninja pirate.Īlso The mkdir dir is only necessary if you move the file to a new folder, of course. When completed, the file is moved and the log is intact. Here you might sed through files to alter references to the file and so on. I normally test to see if the file is present (otherwise it's not there yet to move) and then perform the necessary steps to shoehorn the tree to my liking. Plenty of stuff can go wrong when you do this. Will redo every commit in the branch, executing the command in the ticks for each iteration.

Instead: git filter-branch -tree-filter 'if then mkdir dir & mv old dir/new fi' HEAD This could be done with git mv old dir/new & git add -u dir/new, but that breaks history. Let's move a file using filter-tree!Īssume you're going to move a file old into a folder dir and give it the name new Now, since you're still with me, you're a probably solo developer renaming a completely isolated file. It's not impossible, just tedious and possibly not worth it. To remedy this, you'll have to do a bit more hoop jumping.

If you've referenced the file using it's old name earlier in the repository history, you're effectively breaking earlier versions.

This might be OK if the rename is important enough, but you'll need to consider this carefully - you might end up upsetting an entire opensource community! They will have to re-clone to avoid headaches. If someone else has cloned the repository, you'll break it doing this.

You could be rewriting a shared history, which is the most important DON'T while using Git.

This is probably only for the obsessive git-log-lovers, and has some serious implications, including these:

It is possible to rename a file and keep the history intact, although it causes the file to be renamed throughout the entire history of the repository. In short: if Subversion doing this is wrong, then Git doing this is also wrong - doing this isn't some (mis!)feature, it's a mistake. See GitHub-Gist: emiller/git-mv-with-history.) (There are some too clever hacks that go back and recommit old work, but they are rather frightening.

#BETTER FILE RENAME FOR ANDROID FULL#

git log -follow sometimes does not show the full history of files with complicated rename histories even though git log does. Unfortunately, that breaks Eclipse, which seems to use -follow. With Git you just seem to need to 'git' it right the first time.

#BETTER FILE RENAME FOR ANDROID SOFTWARE#

Change the software to fit the source control. My solution is to rename the files back to their original locations. By design(!) Git does not track moves at all. It is really annoying that so many people have mindlessly repeated the statement that Git automatically tracks moves. Well, sadly, my small brain cannot do that. Linus says that you are supposed to understand the entire contents of a software project holistically, not needing to track individual files. follow does seem to work if only a mv is performed and then a commit and the mv is not too far.)

#BETTER FILE RENAME FOR ANDROID UPDATE#

(Initially I used Eclipse to rename and update packages in one operation, which may have confused Git. Rumor has it that git log -follow -find-copies-harder will work, but it does not work for me, even if there are zero changes to the file contents, and the moves have been made with git mv. It is not possible to rename a file in Git and remember the history.

Better file rename for android