RFR: vcs: proper source paths for merge commits

Robin Westberg rwestberg at openjdk.java.net
Mon Jun 22 04:58:06 UTC 2020

On Sun, 21 Jun 2020 13:27:30 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> please review this patch that fixes an issue with parsing Git merge commits. Without the `--combined-all-paths` the
> "RAW" diff format of `git diff --combined` will only print the resulting (target) path for a rename. This mean that
> `patch.source().path()` would `Optional.empty()` for such a patch. This patch fixes this by passing the
> `--combined-all-paths` flag to `git log` and updating the `GitCombinedDiffParser`.  Testing:
> - [x] Added a new unit test
> - [x] `make test` passes on Linux x64
> Thanks,
> Erik

Looks good!


Marked as reviewed by rwestberg (Reviewer).

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

More information about the skara-dev mailing list