Fix typo in RebaseResult#mySatus
Change-Id: I88d34eec8307231f89343ead06858d1df4ac0886
This commit is contained in:
parent
067ccbfda7
commit
8f8e43b741
|
@ -127,14 +127,14 @@ public boolean isSuccessful() {
|
|||
static final RebaseResult FAST_FORWARD_RESULT = new RebaseResult(
|
||||
Status.FAST_FORWARD);
|
||||
|
||||
private final Status mySatus;
|
||||
private final Status status;
|
||||
|
||||
private final RevCommit currentCommit;
|
||||
|
||||
private Map<String, MergeFailureReason> failingPaths;
|
||||
|
||||
private RebaseResult(Status status) {
|
||||
this.mySatus = status;
|
||||
this.status = status;
|
||||
currentCommit = null;
|
||||
}
|
||||
|
||||
|
@ -145,7 +145,7 @@ private RebaseResult(Status status) {
|
|||
* current commit
|
||||
*/
|
||||
RebaseResult(RevCommit commit) {
|
||||
mySatus = Status.STOPPED;
|
||||
status = Status.STOPPED;
|
||||
currentCommit = commit;
|
||||
}
|
||||
|
||||
|
@ -156,7 +156,7 @@ private RebaseResult(Status status) {
|
|||
* list of paths causing this rebase to fail
|
||||
*/
|
||||
RebaseResult(Map<String, MergeFailureReason> failingPaths) {
|
||||
mySatus = Status.FAILED;
|
||||
status = Status.FAILED;
|
||||
currentCommit = null;
|
||||
this.failingPaths = failingPaths;
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ private RebaseResult(Status status) {
|
|||
* @return the overall status
|
||||
*/
|
||||
public Status getStatus() {
|
||||
return mySatus;
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue