summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-07-18 19:05:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-18 20:32:25 (GMT)
commit3f13877595500bd54ee370167bc868f3c1eee5b7 (patch)
tree6a7940cc0ac743cc9b997cc6c6d7a4a7c41b4b68
parentf3da2b79be9565779e4f76dc5812c68e156afdf0 (diff)
downloadgit-3f13877595500bd54ee370167bc868f3c1eee5b7.zip
git-3f13877595500bd54ee370167bc868f3c1eee5b7.tar.gz
git-3f13877595500bd54ee370167bc868f3c1eee5b7.tar.bz2
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>
-rw-r--r--repository.c2
-rw-r--r--repository.h8
2 files changed, 8 insertions, 2 deletions
diff --git a/repository.c b/repository.c
index edca907..8e60af1 100644
--- a/repository.c
+++ b/repository.c
@@ -235,8 +235,6 @@ int repo_read_index(struct repository *repo)
{
if (!repo->index)
repo->index = xcalloc(1, sizeof(*repo->index));
- else
- discard_index(repo->index);
return read_index_from(repo->index, repo->index_file);
}
diff --git a/repository.h b/repository.h
index 417787f..7f5e24a 100644
--- a/repository.h
+++ b/repository.h
@@ -92,6 +92,14 @@ extern int repo_submodule_init(struct repository *submodule,
const char *path);
extern void repo_clear(struct repository *repo);
+/*
+ * Populates the repository's index from its index_file, an index struct will
+ * be allocated if needed.
+ *
+ * Return the number of index entries in the populated index or a value less
+ * than zero if an error occured. If the repository's index has already been
+ * populated then the number of entries will simply be returned.
+ */
extern int repo_read_index(struct repository *repo);
#endif /* REPOSITORY_H */