summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTomasz Zarna2011-12-27 15:46:19 (EST)
committer Tomasz Zarna2011-12-27 15:47:44 (EST)
commit8f8e43b7414b31b1c66c71d8b22d23307fab899f (patch)
treec7788a51a84ad0c07d85e981147532f3e3ca188c
parent067ccbfda7b1dd804341addff398b1d8720edc63 (diff)
downloadjgit-8f8e43b7414b31b1c66c71d8b22d23307fab899f.zip
jgit-8f8e43b7414b31b1c66c71d8b22d23307fab899f.tar.gz
jgit-8f8e43b7414b31b1c66c71d8b22d23307fab899f.tar.bz2
Fix typo in RebaseResult#mySatusrefs/changes/85/4885/1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
index 07cd8eb..e389d99 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
+++ b/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(
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 @@ public class RebaseResult {
* current commit
*/
RebaseResult(RevCommit commit) {
- mySatus = Status.STOPPED;
+ status = Status.STOPPED;
currentCommit = commit;
}
@@ -156,7 +156,7 @@ public class RebaseResult {
* 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 @@ public class RebaseResult {
* @return the overall status
*/
public Status getStatus() {
- return mySatus;
+ return status;
}
/**