Not about this patch, but viewing this with git show -w --color-moved=zebra gives an interesting result. The bulk of the part moved are re-indented, and the comment string gets zebra stripes, as if the line movement detection code does not realize that these came from the same place.