motiejus
/
jgit
1
Fork 0
Code Releases Activity

Cleanup MergeResult constructors 

'mergeStrategy' should be 5th argument, after 'mergeStatus'. Pass
'description' if available.

Change-Id: I97cebfe5d7db6247fe899075d917b82955906f85
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
This commit is contained in:
Tomasz Zarna 2012-03-15 18:04:16 +01:00 committed by Chris Aniszczyk
parent c394d05a47
commit ef98c3ec86
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
View File

@ -170,17 +170,19 @@ public boolean isSuccessful() {
* all the commits which have been merged together * all the commits which have been merged together
* @param mergeStatus * @param mergeStatus
* the status the merge resulted in * the status the merge resulted in
* @param mergeStrategy
* the used {@link MergeStrategy}
* @param lowLevelResults * @param lowLevelResults
* merge results as returned by * merge results as returned by
* {@link ResolveMerger#getMergeResults()} * {@link ResolveMerger#getMergeResults()}
* @param mergeStrategy * @since 2.0
* the used {@link MergeStrategy}
*/ */
public MergeResult(ObjectId newHead, ObjectId base, public MergeResult(ObjectId newHead, ObjectId base,
ObjectId[] mergedCommits, MergeStatus mergeStatus, ObjectId[] mergedCommits, MergeStatus mergeStatus,
Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults, MergeStrategy mergeStrategy,
MergeStrategy mergeStrategy) { Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults) {
this(newHead, base, mergedCommits, mergeStatus, mergeStrategy, lowLevelResults, null); this(newHead, base, mergedCommits, mergeStatus, mergeStrategy,
lowLevelResults, null);
} }
/** /**
@ -207,7 +209,7 @@ public MergeResult(ObjectId newHead, ObjectId base,
Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults, Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults,
String description) { String description) {
this(newHead, base, mergedCommits, mergeStatus, mergeStrategy, this(newHead, base, mergedCommits, mergeStatus, mergeStrategy,
lowLevelResults, null, null); lowLevelResults, null, description);
} }
/** /**