Browse Source

Fix typo in RebaseResult#mySatus

Change-Id: I88d34eec8307231f89343ead06858d1df4ac0886
stable-1.3
Tomasz Zarna 13 years ago
parent
commit
8f8e43b741
  1. 10
      org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java

10
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java

@ -127,14 +127,14 @@ public class RebaseResult {
static final RebaseResult FAST_FORWARD_RESULT = new RebaseResult( static final RebaseResult FAST_FORWARD_RESULT = new RebaseResult(
Status.FAST_FORWARD); Status.FAST_FORWARD);
private final Status mySatus; private final Status status;
private final RevCommit currentCommit; private final RevCommit currentCommit;
private Map<String, MergeFailureReason> failingPaths; private Map<String, MergeFailureReason> failingPaths;
private RebaseResult(Status status) { private RebaseResult(Status status) {
this.mySatus = status; this.status = status;
currentCommit = null; currentCommit = null;
} }
@ -145,7 +145,7 @@ public class RebaseResult {
* current commit * current commit
*/ */
RebaseResult(RevCommit commit) { RebaseResult(RevCommit commit) {
mySatus = Status.STOPPED; status = Status.STOPPED;
currentCommit = commit; currentCommit = commit;
} }
@ -156,7 +156,7 @@ public class RebaseResult {
* list of paths causing this rebase to fail * list of paths causing this rebase to fail
*/ */
RebaseResult(Map<String, MergeFailureReason> failingPaths) { RebaseResult(Map<String, MergeFailureReason> failingPaths) {
mySatus = Status.FAILED; status = Status.FAILED;
currentCommit = null; currentCommit = null;
this.failingPaths = failingPaths; this.failingPaths = failingPaths;
} }
@ -165,7 +165,7 @@ public class RebaseResult {
* @return the overall status * @return the overall status
*/ */
public Status getStatus() { public Status getStatus() {
return mySatus; return status;
} }
/** /**

Loading…
Cancel
Save