From 871ae34a1bb65ac7d9b77c1acc066b5010809466 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Wed, 31 Jan 2018 08:42:25 -0800
Subject: [PATCH] Hotfix of stale file contents in 186898

---
 src/import_pipeline.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/import_pipeline.cc b/src/import_pipeline.cc
index 823cb696..fa189f64 100644
--- a/src/import_pipeline.cc
+++ b/src/import_pipeline.cc
@@ -285,7 +285,12 @@ std::vector<FileContents> PreloadFileContents(
   bool loaded_entry = false;
   std::vector<FileContents> file_contents;
   cache_manager->IterateLoadedCaches([&](IndexFile* index) {
-    file_contents.push_back(FileContents(index->path, index->file_contents));
+    optional<std::string> index_content = ReadContent(index->path);
+    if (!index_content) {
+      LOG_S(ERROR) << "Failed to load index content for " << index->path;
+      return;
+    }
+    file_contents.push_back(FileContents(index->path, *index_content));
     loaded_entry = loaded_entry || index->path == entry.filename;
   });
   if (!loaded_entry)