Fixes RebaseFixture tests by adding .gitattributes file to repo

Author: J Wyman

LibGit2Sharp.Tests/FilterFixture.cs

@@ -304,7 +304,6 @@ private unsafe bool CharArrayAreEqual(char[] array1, char[] array2, int count)
             return true;
         }
 
-
         private FileInfo CheckoutFileForSmudge(string repoPath, string branchName, string content)
         {
             FileInfo expectedPath;
@@ -350,11 +349,6 @@ private Repository CreateTestRepository(string path)
             return repository;
         }
 
-        private static void CreateAttributesFile(IRepository repo, string attributeEntry)
-        {
-            Touch(repo.Info.WorkingDirectory, ".gitattributes", attributeEntry);
-        }
-
         class EmptyFilter : Filter
         {
             public EmptyFilter(string name, IEnumerable<FilterAttributeEntry> attributes)

LibGit2Sharp.Tests/RebaseFixture.cs

@@ -262,9 +262,9 @@ public void VerifyRebaseDetailed()
 
                 List<ObjectId> expectedTreeIds = new List<ObjectId>()
                 {
-                    new ObjectId("447bad85bcc1882037848370620a6f88e8ee264e"),
-                    new ObjectId("3b0fc846952496a64b6149064cde21215daca8f8"),
-                    new ObjectId("a2d114246012daf3ef8e7ccbfbe91889a24e1e60"),
+                    new ObjectId("2cad6e96a0028f1764dcbde6292a9a1471acb114"),
+                    new ObjectId("18fd3deebe6124b5dacc8426d589d617a968e8d1"),
+                    new ObjectId("048977d8cb90d530e83cc615a17a49f3068f68c1"),
                 };
 
                 List<Commit> rebasedCommits = repo.Commits.QueryBy(commitFilter).ToList();
@@ -602,7 +602,7 @@ public void CanRebaseHandlePatchAlreadyApplied()
 
                 repo.Checkout(topicBranch1Name);
 
-                 Branch topicBranch1Prime = repo.CreateBranch(topicBranch1PrimeName, masterBranch1Name);
+                Branch topicBranch1Prime = repo.CreateBranch(topicBranch1PrimeName, masterBranch1Name);
 
                 string newFileRelativePath = "new_file.txt";
                 Touch(repo.Info.WorkingDirectory, newFileRelativePath, "New Content");
@@ -631,7 +631,7 @@ public void CanRebaseHandlePatchAlreadyApplied()
                 };
 
                 repo.Rebase.Start(null, upstreamBranch, null, Constants.Identity2, options);
-                ObjectId secondCommitExpectedTreeId = new ObjectId("ac04bf04980c9be72f64ba77fd0d9088a40ed681");
+                ObjectId secondCommitExpectedTreeId = new ObjectId("379e80ed7824be7672e1e30ddd8f44aa081d57d4");
                 Signature secondCommitAuthorSignature = Constants.Signature;
                 Identity secondCommitCommiterIdentity = Constants.Identity2;
 
@@ -700,6 +700,11 @@ private void ConstructRebaseTestRepository(Repository repo)
             string workdir = repo.Info.WorkingDirectory;
             Commit commit = null;
 
+            CreateAttributesFile(repo, "* text=auto");
+
+            repo.Stage(".gitattributes");
+            commit = repo.Commit("setup", Constants.Signature, Constants.Signature, new CommitOptions());
+
             Touch(workdir, filePathA, fileContentA1);
             repo.Stage(filePathA);
             commit = repo.Commit("commit 1", Constants.Signature, Constants.Signature, new CommitOptions());

LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

@@ -49,7 +49,7 @@ static BaseFixture()
         protected static DateTimeOffset TruncateSubSeconds(DateTimeOffset dto)
         {
             int seconds = dto.ToSecondsSinceEpoch();
-            return Epoch.ToDateTimeOffset(seconds, (int) dto.Offset.TotalMinutes);
+            return Epoch.ToDateTimeOffset(seconds, (int)dto.Offset.TotalMinutes);
         }
 
         private static void SetUpTestEnvironment()
@@ -258,7 +258,7 @@ protected void RequiresDotNetOrMonoGreaterThanOrEqualTo(System.Version minimumVe
                 throw new InvalidOperationException("Cannot access Mono.RunTime.GetDisplayName() method.");
             }
 
-            var version = (string) displayName.Invoke(null, null);
+            var version = (string)displayName.Invoke(null, null);
 
             System.Version current;
 
@@ -460,5 +460,10 @@ public void AssertBelongsToARepository<T>(IRepository repo, T instance)
         {
             Assert.Same(repo, ((IBelongToARepository)instance).Repository);
         }
+
+        protected void CreateAttributesFile(IRepository repo, string attributeEntry)
+        {
+            Touch(repo.Info.WorkingDirectory, ".gitattributes", attributeEntry);
+        }
     }
 }