crashsplash
diff --git a/‎LibGit2Sharp.Tests/ConflictFixture.cs
Lines changed: 4 additions & 4 deletions b/‎LibGit2Sharp.Tests/ConflictFixture.cs
Lines changed: 4 additions & 4 deletions
diff --git a/‎LibGit2Sharp/Index.cs
Lines changed: 15 additions & 0 deletions b/‎LibGit2Sharp/Index.cs
Lines changed: 15 additions & 0 deletions
diff --git a/‎LibGit2Sharp/Repository.cs
Lines changed: 2 additions & 8 deletions b/‎LibGit2Sharp/Repository.cs
Lines changed: 2 additions & 8 deletions
@@ -60,11 +60,11 @@ public void CanClearConflictsByRemovingFromTheIndex(
                 string fullpath = Path.Combine(repo.Info.WorkingDirectory, filename);
 
                 Assert.Equal(existsBeforeRemove, File.Exists(fullpath));
-                Assert.NotNull(repo.Conflicts[filename]);
+                Assert.NotNull(repo.Index.Conflicts[filename]);
 
                 repo.Index.Remove(filename, removeFromWorkdir);
 
-                Assert.Null(repo.Conflicts[filename]);
+                Assert.Null(repo.Index.Conflicts[filename]);
                 Assert.Equal(count - removedIndexEntries, repo.Index.Count);
                 Assert.Equal(existsAfterRemove, File.Exists(fullpath));
                 Assert.Equal(lastStatus, repo.Index.RetrieveStatus(filename));
@@ -76,7 +76,7 @@ public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId,
         {
             using (var repo = new Repository(MergedTestRepoWorkingDirPath))
             {
-                Conflict conflict = repo.Conflicts[filepath];
+                Conflict conflict = repo.Index.Conflicts[filepath];
                 Assert.NotNull(conflict);
 
                 ObjectId expectedAncestor = ancestorId != null ? new ObjectId(ancestorId) : null;
@@ -123,7 +123,7 @@ public void CanRetrieveAllConflicts()
         {
             using (var repo = new Repository(MergedTestRepoWorkingDirPath))
             {
-                var expected = repo.Conflicts.Select(c => new[] { GetPath(c), GetId(c.Ancestor), GetId(c.Ours), GetId(c.Theirs) }).ToArray();
+                var expected = repo.Index.Conflicts.Select(c => new[] { GetPath(c), GetId(c.Ancestor), GetId(c.Ours), GetId(c.Theirs) }).ToArray();
                 Assert.Equal(expected, ConflictData);
             }
 
@@ -21,6 +21,7 @@ public class Index : IEnumerable<IndexEntry>
     {
         private readonly IndexSafeHandle handle;
         private readonly Repository repo;
+        private readonly ConflictCollection conflicts;
 
         /// <summary>
         ///   Needed for mocking purposes.
@@ -33,6 +34,8 @@ internal Index(Repository repo)
             this.repo = repo;
 
             handle = Proxy.git_repository_index(repo.Handle);
+            conflicts = new ConflictCollection(repo);
+
             repo.RegisterForCleanup(handle);
         }
 
@@ -42,6 +45,7 @@ internal Index(Repository repo, string indexPath)
 
             handle = Proxy.git_index_open(indexPath);
             Proxy.git_repository_set_index(repo.Handle, handle);
+            conflicts = new ConflictCollection(repo);
 
             repo.RegisterForCleanup(handle);
         }
@@ -528,6 +532,17 @@ internal void Reset(TreeChanges changes)
             UpdatePhysicalIndex();
         }
 
+        /// <summary>
+        ///  Gets the conflicts that exist.
+        /// </summary>
+        public virtual ConflictCollection Conflicts
+        {
+            get
+            {
+                return conflicts;
+            }
+        }
+
         private void ReplaceIndexEntryWith(TreeEntryChanges treeEntryChanges)
         {
             var indexEntry = new GitIndexEntry
 
@@ -25,7 +25,6 @@ public class Repository : IRepository
         private readonly Lazy<Configuration> config;
         private readonly RepositorySafeHandle handle;
         private readonly Index index;
-        private readonly ConflictCollection conflicts;
         private readonly ReferenceCollection refs;
         private readonly TagCollection tags;
         private readonly StashCollection stashes;
@@ -99,7 +98,6 @@ public Repository(string path, RepositoryOptions options = null)
                 if (!isBare)
                 {
                     index = indexBuilder();
-                    conflicts = new ConflictCollection(this);
                 }
 
                 commits = new CommitLog(this);
@@ -233,16 +231,12 @@ public Index Index
         /// <summary>
         ///  Gets the conflicts that exist.
         /// </summary>
+        [Obsolete("This property will be removed in the next release. Please use Index.Conflicts instead.")]
         public ConflictCollection Conflicts
         {
             get
             {
-                if (isBare)
-                {
-                    throw new BareRepositoryException("Conflicts are not available in a bare repository.");
-                }
-
-                return conflicts;
+                return Index.Conflicts;
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ public void CanClearConflictsByRemovingFromTheIndex(`
`60`	`60`	`string fullpath = Path.Combine(repo.Info.WorkingDirectory, filename);`
`61`	`61`
`62`	`62`	`Assert.Equal(existsBeforeRemove, File.Exists(fullpath));`
`63`		`- Assert.NotNull(repo.Conflicts[filename]);`
	`63`	`+ Assert.NotNull(repo.Index.Conflicts[filename]);`
`64`	`64`
`65`	`65`	`repo.Index.Remove(filename, removeFromWorkdir);`
`66`	`66`
`67`		`- Assert.Null(repo.Conflicts[filename]);`
	`67`	`+ Assert.Null(repo.Index.Conflicts[filename]);`
`68`	`68`	`Assert.Equal(count - removedIndexEntries, repo.Index.Count);`
`69`	`69`	`Assert.Equal(existsAfterRemove, File.Exists(fullpath));`
`70`	`70`	`Assert.Equal(lastStatus, repo.Index.RetrieveStatus(filename));`
`@@ -76,7 +76,7 @@ public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId,`
`76`	`76`	`{`
`77`	`77`	`using (var repo = new Repository(MergedTestRepoWorkingDirPath))`
`78`	`78`	`{`
`79`		`- Conflict conflict = repo.Conflicts[filepath];`
	`79`	`+ Conflict conflict = repo.Index.Conflicts[filepath];`
`80`	`80`	`Assert.NotNull(conflict);`
`81`	`81`
`82`	`82`	`ObjectId expectedAncestor = ancestorId != null ? new ObjectId(ancestorId) : null;`
`@@ -123,7 +123,7 @@ public void CanRetrieveAllConflicts()`
`123`	`123`	`{`
`124`	`124`	`using (var repo = new Repository(MergedTestRepoWorkingDirPath))`
`125`	`125`	`{`
`126`		`- var expected = repo.Conflicts.Select(c => new[] { GetPath(c), GetId(c.Ancestor), GetId(c.Ours), GetId(c.Theirs) }).ToArray();`
	`126`	`+ var expected = repo.Index.Conflicts.Select(c => new[] { GetPath(c), GetId(c.Ancestor), GetId(c.Ours), GetId(c.Theirs) }).ToArray();`
`127`	`127`	`Assert.Equal(expected, ConflictData);`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public class Repository : IRepository`
`25`	`25`	`private readonly Lazy<Configuration> config;`
`26`	`26`	`private readonly RepositorySafeHandle handle;`
`27`	`27`	`private readonly Index index;`
`28`		`- private readonly ConflictCollection conflicts;`
`29`	`28`	`private readonly ReferenceCollection refs;`
`30`	`29`	`private readonly TagCollection tags;`
`31`	`30`	`private readonly StashCollection stashes;`
`@@ -99,7 +98,6 @@ public Repository(string path, RepositoryOptions options = null)`
`99`	`98`	`if (!isBare)`
`100`	`99`	`{`
`101`	`100`	`index = indexBuilder();`
`102`		`- conflicts = new ConflictCollection(this);`
`103`	`101`	`}`
`104`	`102`
`105`	`103`	`commits = new CommitLog(this);`
`@@ -233,16 +231,12 @@ public Index Index`
`233`	`231`	`/// <summary>`
`234`	`232`	`/// Gets the conflicts that exist.`
`235`	`233`	`/// </summary>`
	`234`	`+ [Obsolete("This property will be removed in the next release. Please use Index.Conflicts instead.")]`
`236`	`235`	`public ConflictCollection Conflicts`
`237`	`236`	`{`
`238`	`237`	`get`
`239`	`238`	`{`
`240`		`- if (isBare)`
`241`		`- {`
`242`		`- throw new BareRepositoryException("Conflicts are not available in a bare repository.");`
`243`		`- }`
`244`		`-`
`245`		`- return conflicts;`
	`239`	`+ return Index.Conflicts;`
`246`	`240`	`}`
`247`	`241`	`}`
`248`	`242`