Merge pull request #1929 from libgit2/rb/misc-diff-fixes Fix some observed problems with incorrect diffs