Merge pull request #1892 from libgit2/ntk/topic/index_read

Make git_index_read() cope with external additions and removals of the index file

1 files changed, 3 insertions, 2 deletions

diff --git a/src/index.c b/src/index.c
index 21a8d31d1..c923f1675 100644
--- a/src/index.c
+++ b/src/index.c
@@ -461,9 +461,10 @@ int git_index_read(git_index *index)
 		return create_index_error(-1,
 			"Failed to read index: The index is in-memory only");
 
-	if (!index->on_disk || git_path_exists(index->index_file_path) == false) {
+	index->on_disk = git_path_exists(index->index_file_path);
+
+	if (!index->on_disk) {
 		git_index_clear(index);
-		index->on_disk = 0;
 		return 0;
 	}