diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 3475ed7d64..f058014f67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -86,6 +86,8 @@ public class RevertCommand extends GitCommand<RevCommit> { private MergeResult failingResult; + private List<String> unmergedPaths; + /** * @param repo */ @@ -160,6 +162,7 @@ public class RevertCommand extends GitCommand<RevCommit> { .setReflogComment("revert: " + shortMessage).call(); revertedRefs.add(src); } else { + unmergedPaths = merger.getUnmergedPaths(); Map<String, MergeFailureReason> failingPaths = merger .getFailingPaths(); if (failingPaths != null) @@ -232,4 +235,11 @@ public class RevertCommand extends GitCommand<RevCommit> { public MergeResult getFailingResult() { return failingResult; } + + /** + * @return the unmerged paths, will be null if no merge conflicts + */ + public List<String> getUnmergedPaths() { + return unmergedPaths; + } } |