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