diff options
| author | Philipp Thun <philipp.thun@sap.com> | 2011-03-21 12:33:58 +0100 |
|---|---|---|
| committer | Philipp Thun <philipp.thun@sap.com> | 2011-03-21 12:33:58 +0100 |
| commit | dcf7bd9a8f7acafbd1461dc0414aded2db030983 (patch) | |
| tree | becc224ee4f4cf77178cce4cf5f5142257edd7f8 /org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | |
| parent | dcefc660f15a85fcc2b4ca21ca5d12938b157e82 (diff) | |
| download | jgit-dcf7bd9a8f7acafbd1461dc0414aded2db030983.tar.gz jgit-dcf7bd9a8f7acafbd1461dc0414aded2db030983.zip | |
Improve MergeResult
Add paths causing abnormal merge failures (e.g. due to unstaged
changes) to the MergeResult returned by MergeCommand. This helps
callers to better handle (e.g. present) merge results.
Change-Id: Idb8cf04c5cecfb6a12cb880e16febfc3b9358564
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index 29ce00e448..39c079896b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -229,7 +229,7 @@ public class MergeCommand extends GitCommand<MergeResult> { new ObjectId[] { headCommit.getId(), srcCommit.getId() }, MergeStatus.FAILED, mergeStrategy, - lowLevelResults, null); + lowLevelResults, failingPaths, null); } else return new MergeResult(null, merger.getBaseCommit(0, 1), |