[PATCH 1/2] get_main_ref_store: BUG() when outside a repository
- From
Jeff King <peff@peff.net>
- Date
- May 18, 2018, 22:25 UTC
- Message-ID
- <20180518222552.GA9623@sigill.intra.peff.net>
- In-Reply-To
- <20180518222506.GA9527@sigill.intra.peff.net>
If we don't have a repository, then we can't initialize the ref store. Prior to 64a741619d (refs: store the main ref store inside the repository struct, 2018-04-11), we'd try to access get_git_dir(), and outside a repository that would trigger a BUG(). After that commit, though, we directly use the_repository->git_dir; if it's NULL we'll just segfault.
Let's catch this case and restore the BUG() behavior. Obviously we don't ever want to hit this code, but a BUG() is a lot more helpful than a segfault if we do.
Signed-off-by: Jeff King <peff@peff.net> --- refs.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/refs.c b/refs.c index 64aadd14c9..2e4a42f459 100644 --- a/refs.c +++ b/refs.c @@ -1668,6 +1668,9 @@ struct ref_store *get_main_ref_store(struct repository *r) if (r->refs) return r->refs; + if (!r->gitdir) + BUG("attempting to get main_ref_store outside of repository"); + r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS); return r->refs; }
-- 2.17.0.1052.g7d69f75dbf