On Thursday 11 March 2010 13:16:09 Alexander Gladysh wrote: > On Thu, Mar 11, 2010 at 07:57, Christian Couder <chriscool@xxxxxxxxxxxxx> wrote: > > On Tuesday 09 March 2010 02:28:30 Alexander Gladysh wrote: > >> I'm complaining about Git symlink handling again. This time it is > >> cherry-pick. > > > > I can reproduce the bug here on Linux. And Git v1.6.0 has the same bug. > > So I suspect an old bug in unpack_trees.c. I will try to have another > > look at it this evening, but I am not familiar with that code. > > I have found my old bug-report. There is even some patch in that thread. > > http://thread.gmane.org/gmane.comp.version-control.git/120741/ > > Not sure if it is the same issue or if the patch was even merged in > though... The patch was merged: commit 77716755cbdf970fa0814a5f77c884b1f17693de Author: Kjetil Barvik <barvik@xxxxxxxxxxxx> Date: Sun Jun 14 15:08:28 2009 +0200 lstat_cache: guard against full match of length of 'name' parameter so I think it is a different issue, but feel free to test. Anyway when looking at t/t6035-merge-dir-to-symlink.sh, we can see that there are still 2 broken tests: $ ./t6035-merge-dir-to-symlink.sh * ok 1: create a commit where dir a/b changed to symlink * ok 2: keep a/b-2/c/d across checkout * ok 3: checkout should not have deleted a/b-2/c/d * ok 4: setup for merge test * ok 5: do not lose a/b-2/c/d in merge (resolve) * still broken 6: do not lose a/b-2/c/d in merge (recursive) * ok 7: setup a merge where dir a/b-2 changed to symlink * ok 8: merge should not have conflicts (resolve) * still broken 9: merge should not have conflicts (recursive) * still have 2 known breakage(s) * passed all remaining 7 test(s) So it looks like breakages in this area are known, though perhaps not your particular breakage. Best regards, Christian. -- 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