This patch doesn't apply, as it seems to use some git magic.But looking at it it's also wrong in that it mixes a file moveand actual changes to the file.