summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:55 (GMT)
commit95ca48973d351cdd40e6497b82ab85b95e432fab (patch)
tree9e275d3dad4046ec1f10fde07ee10cee21231449 /refs.c
parentbc20556505e4c337d34d1e5272c9bdc274dd081a (diff)
parent022046107186746913ef43a33f4b6862817bf6da (diff)
downloadgit-95ca48973d351cdd40e6497b82ab85b95e432fab.zip
git-95ca48973d351cdd40e6497b82ab85b95e432fab.tar.gz
git-95ca48973d351cdd40e6497b82ab85b95e432fab.tar.bz2
Merge branch 'jc/missing-ref-store-fix'
We've left the command line parsing of "git log :/a/b/" broken for about a full year without anybody noticing, which has been corrected. * jc/missing-ref-store-fix: repository: mark the "refs" pointer as private sha1-name: do not assume that the ref store is initialized
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/refs.c b/refs.c
index 1ab0bb5..b875911 100644
--- a/refs.c
+++ b/refs.c
@@ -1852,14 +1852,14 @@ static struct ref_store *ref_store_init(const char *gitdir,
struct ref_store *get_main_ref_store(struct repository *r)
{
- if (r->refs)
- return r->refs;
+ if (r->refs_private)
+ return r->refs_private;
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;
+ r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+ return r->refs_private;
}
/*