Integrated: vcs: proper source paths for merge commits

Erik Helin ehelin at
Mon Jun 22 06:18:55 UTC 2020

On Sun, 21 Jun 2020 13:27:30 GMT, Erik Helin <ehelin at> 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

This pull request has now been integrated.

Changeset: 7f84ac80
Author:    Erik Helin <ehelin at>
Stats:     60 lines in 3 files changed: 0 ins; 54 del; 6 mod

vcs: proper source paths for merge commits

Reviewed-by: rwestberg



More information about the skara-dev mailing list