Merge branch 'js/params-vs-args'

[thirdparty/git.git] / repository.c

diff --git a/repository.c b/repository.c
index a4174ddb0629cdd690142fb42c5d4182492485c4..c98298acd017b551894f838e2000b253b271202e 100644 (file)
--- a/repository.c
+++ b/repository.c
@@ -264,6 +264,12 @@ int repo_read_index(struct repository *repo)
        if (!repo->index)
                repo->index = xcalloc(1, sizeof(*repo->index));
 
+       /* Complete the double-reference */
+       if (!repo->index->repo)
+               repo->index->repo = repo;
+       else if (repo->index->repo != repo)
+               BUG("repo's index should point back at itself");
+
        return read_index_from(repo->index, repo->index_file, repo->gitdir);
 }