path: root/builtin-apply.c
diff options
authorEric Wong <>2006-07-16 10:38:40 (GMT)
committerJunio C Hamano <>2006-07-17 05:15:21 (GMT)
commit8641fb24ee3ab86bac62f88d31f6e92a9323f699 (patch)
tree580870af338d4ee6d802079baaafb466d6d9414d /builtin-apply.c
parent7b520e62a2738ce776d1c9f11144021ff1fc63b6 (diff)
typechange tests for git apply (currently failing)
I've found that git apply is incapable of handling patches involving object type changes to the same path. Of course git itself is perfectly capable of making commits that generate these changes, as it only tracks trees states. It's just that the diffs between them are less useful if they can't be applied. Some of these are rare, but I've hit one of them (file becoming a symlink) recently in real-world usage, and was inspired to find more potential breakages :) I'm not sure when I'll have time to fix these myself and I'm not very familiar with the apply code. So if someone could get some or all of these cases working, they would be my hero :) Some of these are what I would refer to as corner-cases from hell. Most (if not all) other systems fail some of these. In fact, they aren't even capable of representing most of these changes in their histories; much less being able to handle patches to that effect. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions