Skip to content

Commit b122539

Browse files
author
J Wyman
committed
fixes based on feedback from @jamill
1 parent cf70b9d commit b122539

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

LibGit2Sharp.Tests/RebaseFixture.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ public void CanRebase(string initialBranchName,
6262

6363
RebaseOptions options = new RebaseOptions()
6464
{
65-
RebaseStepStarting = x =>
66-
{
67-
beforeRebaseStepCountCorrect &= beforeStepCallCount == x.StepIndex;
68-
totalStepCountCorrect &= (x.TotalStepCount == stepCount);
69-
beforeStepCallCount++;
70-
PreRebaseCommits.Add(x.StepInfo.Commit);
71-
},
65+
RebaseStepStarting = x =>
66+
{
67+
beforeRebaseStepCountCorrect &= beforeStepCallCount == x.StepIndex;
68+
totalStepCountCorrect &= (x.TotalStepCount == stepCount);
69+
beforeStepCallCount++;
70+
PreRebaseCommits.Add(x.StepInfo.Commit);
71+
},
7272
RebaseStepCompleted = x =>
7373
{
7474
afterRebaseStepCountCorrect &= (afterStepCallCount == x.CompletedStepIndex);
@@ -262,15 +262,15 @@ public void VerifyRebaseDetailed()
262262

263263
List<ObjectId> expectedTreeIds = new List<ObjectId>()
264264
{
265-
new ObjectId("e20530e760c7e3009e2a482d8bcb0cd69f1ffb65"),
266-
new ObjectId("3a3b0dce3266801cf90eaa58f4b5b1f7955a49be"),
267-
new ObjectId("27559b63dd0afcb93c2058b96e91d9266466c3c4"),
265+
new ObjectId("8cb248a2a802b0003cc086db61cf947ed1630da6"),
266+
new ObjectId("f95ce8cacd210f14538b8f90ce0f46aae283d61d"),
267+
new ObjectId("28b9fb1c72372dcbac4a7093587af50491483c37"),
268268
};
269269

270270
List<Commit> rebasedCommits = repo.Commits.QueryBy(commitFilter).ToList();
271271

272272
Assert.Equal(3, rebasedCommits.Count);
273-
for (int i = 0; i < 3; i++)
273+
for(int i = 0; i < 3; i++)
274274
{
275275
Assert.Equal(expectedTreeIds[i], rebasedCommits[i].Tree.Id);
276276
Assert.Equal(Constants.Signature.Name, rebasedCommits[i].Author.Name);
@@ -631,7 +631,7 @@ public void CanRebaseHandlePatchAlreadyApplied()
631631
};
632632

633633
repo.Rebase.Start(null, upstreamBranch, null, Constants.Identity2, options);
634-
ObjectId secondCommitExpectedTreeId = new ObjectId("7845bcdf89faf2b1f992758962b333aff874ce51");
634+
ObjectId secondCommitExpectedTreeId = new ObjectId("15d9e401253241eedfa0db97ab899b3faec9b04b");
635635
Signature secondCommitAuthorSignature = Constants.Signature;
636636
Identity secondCommitCommiterIdentity = Constants.Identity2;
637637

@@ -700,7 +700,7 @@ private void ConstructRebaseTestRepository(Repository repo)
700700
string workdir = repo.Info.WorkingDirectory;
701701
Commit commit = null;
702702

703-
CreateAttributesFile(repo, "* text=auto\n.gitattributes eol=lf");
703+
CreateAttributesFile(repo, "* eol=lf");
704704
repo.Stage(".gitattributes");
705705
commit = repo.Commit("setup", Constants.Signature, Constants.Signature, new CommitOptions());
706706

0 commit comments

Comments
 (0)