org.eclipse.jgit.api.CherryPickResult.getFailingPaths() seems to always contain a single entry

[sorincarbunaru]

Version

7.1.0

Operating System

Windows

Bug description

I am trying to cherry-pick a commit that contains 2 modified files using CherryPickCommand. The cherry-pick results in CherryPickStatus.FAILED, because I also have the same 2 files modified in my working copy (as unstaged files). When I print CherryPickResult.getFailingPaths(), I only see only one file in the map with MergeFailureReason=DIRTY_WORKTREE.

Actual behavior

CherryPickResult.getFailingPaths() reports a single failing path.

Expected behavior

CherryPickResult.getFailingPaths() should have reported 2 failing paths.

Relevant log output

Other information

I tried the same scenario in EGit in Eclipse. It also reports a single failing path, although SourceTree for example reports, as expected, 2 of them.

[tomaswolf]

Yes, the ResolveMergerstops on the first failing path.