@@ -262,9 +262,9 @@ public void VerifyRebaseDetailed()
262
262
263
263
List < ObjectId > expectedTreeIds = new List < ObjectId > ( )
264
264
{
265
- new ObjectId ( "8cb248a2a802b0003cc086db61cf947ed1630da6 " ) ,
266
- new ObjectId ( "f95ce8cacd210f14538b8f90ce0f46aae283d61d " ) ,
267
- new ObjectId ( "28b9fb1c72372dcbac4a7093587af50491483c37 " ) ,
265
+ new ObjectId ( "2cad6e96a0028f1764dcbde6292a9a1471acb114 " ) ,
266
+ new ObjectId ( "18fd3deebe6124b5dacc8426d589d617a968e8d1 " ) ,
267
+ new ObjectId ( "048977d8cb90d530e83cc615a17a49f3068f68c1 " ) ,
268
268
} ;
269
269
270
270
List < Commit > rebasedCommits = repo . Commits . QueryBy ( commitFilter ) . ToList ( ) ;
@@ -631,7 +631,7 @@ public void CanRebaseHandlePatchAlreadyApplied()
631
631
} ;
632
632
633
633
repo . Rebase . Start ( null , upstreamBranch , null , Constants . Identity2 , options ) ;
634
- ObjectId secondCommitExpectedTreeId = new ObjectId ( "15d9e401253241eedfa0db97ab899b3faec9b04b " ) ;
634
+ ObjectId secondCommitExpectedTreeId = new ObjectId ( "379e80ed7824be7672e1e30ddd8f44aa081d57d4 " ) ;
635
635
Signature secondCommitAuthorSignature = Constants . Signature ;
636
636
Identity secondCommitCommiterIdentity = Constants . Identity2 ;
637
637
@@ -700,7 +700,8 @@ private void ConstructRebaseTestRepository(Repository repo)
700
700
string workdir = repo . Info . WorkingDirectory ;
701
701
Commit commit = null ;
702
702
703
- CreateAttributesFile ( repo , "* eol=lf" ) ;
703
+ CreateAttributesFile ( repo , "* text=auto" ) ;
704
+
704
705
repo . Stage ( ".gitattributes" ) ;
705
706
commit = repo . Commit ( "setup" , Constants . Signature , Constants . Signature , new CommitOptions ( ) ) ;
706
707
0 commit comments