RFR: vcs: handle clean renames in combined diff parser

Robin Westberg rwestberg at openjdk.java.net
Mon Mar 30 11:02:21 UTC 2020

On Mon, 30 Mar 2020 10:55:07 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> please review this patch that makes the combined diff parser handle "clean"
> renames with regards to both parents. A clean rename is when the file is just
> renamed, no lines in the files have changed. The problem is that git does not
> output a `diff --combined` line, nor any hunks, for a clean rename. The combined
> diff parser has been updated to detect this situation and then return empty hunk
> lists.
> I also added a bunch of state checks to the combined diff parser to help
> diagnose future issues faster.
> Testing:
> - `make test` passes on Linux x64
> - Manual testing with large merge commits
> Thanks,
> Erik

Looks good!


Marked as reviewed by rwestberg (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/549

More information about the skara-dev mailing list