On 24/10/06, Karl Hasselström <kha@xxxxxxxxxxx> wrote:
On 2006-10-24 09:48:44 +0100, Catalin Marinas wrote: > Step 3 above is handled per file by the > stgit.gitmergeonefile.merge() function. This is the place where we > should have the rename detection. Since, the majority of the patches > don't rename files and, in most cases, the push finishes at step 2, > it is probably safe to extend this function and the users won't > notice a speed difference. > > I'll add it to the TODO list. Sounds good. I had a feeling it ought to be basically free in the majority of cases, so I'm glad to learn I'm right. :-)
Might be even simpler for 'push' but I need to do more tests - instead of calling git-read-tree in git.merge(), just call git-merge-recursive which handles renames and it's fully tested. My simple test detected renames when pushing patches (both rename in base and rename in patch). I still have to do some tweaking and write proper tests (and probably make it less verbose). -- Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html