Skip to content

Commit 5319f11

Browse files
committed
WIP: rebase
1 parent 5bdac6b commit 5319f11

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

LibGit2Sharp.Tests/RebaseFixture.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ public void CanRebase(string initialBranchName, string branchName, string upstre
5454
Assert.Equal(stepCount, rebaseResult.TotalStepCount);
5555
Assert.Null(rebaseResult.CurrentStepInfo);
5656

57-
// What is the "current step" of a completed operation?
58-
// it looks like it is total steps - 1
5957
Assert.Equal(stepCount, rebaseResult.CompletedStepCount);
6058
Assert.False(repo.RetrieveStatus().IsDirty);
6159

@@ -156,7 +154,7 @@ public void CanQueryRebaseOperation()
156154
Assert.Equal(3, rebaseResult.TotalStepCount);
157155

158156
RebaseStepInfo info = repo.Rebase.GetCurrentStepInfo();
159-
Assert.Equal(0, info.StepIndex);
157+
Assert.Equal(0, info.CurrentStep);
160158
Assert.Equal(3, info.TotalStepCount);
161159
Assert.Equal(RebaseStepOperation.Pick, info.Type);
162160
}

LibGit2Sharp/RebaseStepInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, long
2222
Type = type;
2323
ID = id;
2424
Exec = exec;
25-
StepIndex = stepIndex;
25+
CurrentStep = stepIndex;
2626
TotalStepCount = totalStepCount;
2727
}
2828

@@ -44,7 +44,7 @@ internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, long
4444
/// <summary>
4545
/// The index of this step.
4646
/// </summary>
47-
public virtual long StepIndex { get; private set; }
47+
public virtual long CurrentStep { get; private set; }
4848

4949
/// <summary>
5050
/// The total number of steps.

0 commit comments

Comments
 (0)