WIP: rebase

jamill · jamill · commit 5319f113e72b · 2015-03-09T13:55:58.000-04:00
diff --git a/LibGit2Sharp.Tests/RebaseFixture.cs b/LibGit2Sharp.Tests/RebaseFixture.cs
@@ -54,8 +54,6 @@ public void CanRebase(string initialBranchName, string branchName, string upstre
                 Assert.Equal(stepCount, rebaseResult.TotalStepCount);
                 Assert.Null(rebaseResult.CurrentStepInfo);
 
-                // What is the "current step" of a completed operation?
-                // it looks like it is total steps - 1
                 Assert.Equal(stepCount, rebaseResult.CompletedStepCount);
                 Assert.False(repo.RetrieveStatus().IsDirty);
 
@@ -156,7 +154,7 @@ public void CanQueryRebaseOperation()
                 Assert.Equal(3, rebaseResult.TotalStepCount);
 
                 RebaseStepInfo info = repo.Rebase.GetCurrentStepInfo();
-                Assert.Equal(0, info.StepIndex);
+                Assert.Equal(0, info.CurrentStep);
                 Assert.Equal(3, info.TotalStepCount);
                 Assert.Equal(RebaseStepOperation.Pick, info.Type);
             }
diff --git a/LibGit2Sharp/RebaseStepInfo.cs b/LibGit2Sharp/RebaseStepInfo.cs
@@ -22,7 +22,7 @@ internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, long
             Type = type;
             ID = id;
             Exec = exec;
-            StepIndex = stepIndex;
+            CurrentStep = stepIndex;
             TotalStepCount = totalStepCount;
         }
 
@@ -44,7 +44,7 @@ internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, long
         /// <summary>
         /// The index of this step.
         /// </summary>
-        public virtual long StepIndex { get; private set; }
+        public virtual long CurrentStep { get; private set; }
 
         /// <summary>
         /// The total number of steps.
