From: Duy Nguyen <pclouds@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Eric Wong <e@80x24.org>, Antonio Ospite <ao2@ao2.it>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] get_oid: handle NULL repo->index
Date: Wed, 15 May 2019 08:24:34 +0700 [thread overview]
Message-ID: <CACsJy8AvsyOz2G1zjRjpKYVZ0DLKj02-v=hXJHS0BRHnxoeWAw@mail.gmail.com> (raw)
In-Reply-To: <20190514135455.GA17927@sigill.intra.peff.net>
On Tue, May 14, 2019 at 8:54 PM Jeff King <peff@peff.net> wrote:
> diff --git a/sha1-name.c b/sha1-name.c
> index 775a73d8ad..455e9fb1ea 100644
> --- a/sha1-name.c
> +++ b/sha1-name.c
> @@ -1837,7 +1837,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
> if (flags & GET_OID_RECORD_PATH)
> oc->path = xstrdup(cp);
>
> - if (!repo->index->cache)
> + if (!repo->index || !repo->index->cache)
> repo_read_index(repo);
We could even drop the "if" and call repo_read_index()
unconditionally. If the index is already read, it will be no-op
(forcing a reread has always been discard_index(); read_index();)
Thanks for catching this by the way. I'll need to go through all
the_index conversion to see if I left similar traps like this.
--
Duy
next prev parent reply other threads:[~2019-05-15 1:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-11 20:57 new segfault in master (6a6c0f10a70a6eb1) Eric Wong
2019-05-11 22:31 ` Jeff King
2019-05-11 23:02 ` Jeff King
2019-05-12 4:26 ` Duy Nguyen
2019-05-14 13:54 ` [PATCH] get_oid: handle NULL repo->index Jeff King
2019-05-14 23:38 ` Eric Wong
2019-05-15 1:24 ` Duy Nguyen [this message]
2019-05-15 1:46 ` Jeff King
2019-05-15 5:16 ` Junio C Hamano
2019-05-15 9:29 ` Duy Nguyen
2019-05-16 1:43 ` Junio C Hamano
2019-05-19 2:56 ` [PATCH] repository.c: always allocate 'index' at repo init time Nguyễn Thái Ngọc Duy
2019-05-20 13:17 ` Jeff King
2019-05-21 10:34 ` Duy Nguyen
2019-05-21 20:58 ` Jeff King
2019-05-28 16:07 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8AvsyOz2G1zjRjpKYVZ0DLKj02-v=hXJHS0BRHnxoeWAw@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=ao2@ao2.it \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).