repo_read_index: don't discard the index
Have 'repo_read_index()' behave more like the other read_index family of functions and don't discard the index if it has already been populated and instead rely on the quick return of read_index_from which has: /* istate->initialized covers both .git/index and .git/sharedindex.xxx */ if (istate->initialized) return istate->cache_nr; Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Jul 18, 2017 at 12:05 UTC
3f13877595500bd54ee370167bc868f3c1eee5b7
2 files changed
+8
-2
repository.c
-2
@@ -235,8 +235,6 @@ int repo_read_index(struct repository *repo)
235
{
236
if (!repo->index)
237
repo->index = xcalloc(1, sizeof(*repo->index));
238
- else
239
- discard_index(repo->index);
238
239
return read_index_from(repo->index, repo->index_file);
240
}
repository.h
+8
@@ -92,6 +92,14 @@ extern int repo_submodule_init(struct repository *submodule,
92
const char *path);
93
extern void repo_clear(struct repository *repo);
94
95
+/*
96
+ * Populates the repository's index from its index_file, an index struct will
97
+ * be allocated if needed.
98
+ *
99
+ * Return the number of index entries in the populated index or a value less
100
+ * than zero if an error occured. If the repository's index has already been
101
+ * populated then the number of entries will simply be returned.
102
+ */
103
extern int repo_read_index(struct repository *repo);
104
105
#endif /* REPOSITORY_H */