Make RetrieveStatus() reload on-disk index beforehand

Fix #322 and #522

1 files changed, 34 insertions, 0 deletions

diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
index 5b6f6e4f..f6c1690a 100644
--- a/LibGit2Sharp.Tests/IndexFixture.cs
+++ b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -244,5 +244,39 @@ namespace LibGit2Sharp.Tests
                 Assert.Throws<LockedFileException>(() => repo.Index.Stage("newfile"));
             }
         }
+
+        [Fact]
+        public void CanCopeWithExternalChangesToTheIndex()
+        {
+            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
+
+            Touch(scd.DirectoryPath, "a.txt", "a\n");
+            Touch(scd.DirectoryPath, "b.txt", "b\n");
+
+            string path = Repository.Init(scd.DirectoryPath);
+
+            using (var repoWrite = new Repository(path))
+            using (var repoRead = new Repository(path))
+            {
+                var writeStatus = repoWrite.Index.RetrieveStatus();
+                Assert.True(writeStatus.IsDirty);
+                Assert.Equal(0, repoWrite.Index.Count);
+
+                var readStatus = repoRead.Index.RetrieveStatus();
+                Assert.True(readStatus.IsDirty);
+                Assert.Equal(0, repoRead.Index.Count);
+
+                repoWrite.Index.Stage("*");
+                repoWrite.Commit("message", Constants.Signature, Constants.Signature);
+
+                writeStatus = repoWrite.Index.RetrieveStatus();
+                Assert.False(writeStatus.IsDirty);
+                Assert.Equal(2, repoWrite.Index.Count);
+
+                readStatus = repoRead.Index.RetrieveStatus();
+                Assert.False(readStatus.IsDirty);
+                Assert.Equal(2, repoRead.Index.Count);
+            }
+        }
     }
 }