diff options
| author | Kevin Sawicki <kevin@github.com> | 2011-12-14 14:30:00 -0800 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-12-19 22:46:20 +0100 |
| commit | 52507ee2e7a826adc7a3d37b3234f102754aa579 (patch) | |
| tree | 83c0b2fab51a2b099688270c97f7b829dc096822 | |
| parent | 0ca105a502a5edb0abf1c344772426a6184f20cb (diff) | |
| download | jgit-52507ee2e7a826adc7a3d37b3234f102754aa579.tar.gz jgit-52507ee2e7a826adc7a3d37b3234f102754aa579.zip | |
Expose unmerged paths when revert fails
Change-Id: I02678aeb31a62668ae2b0342a6dae721e043dc5e
| -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; + } } |