[PATCH 3/6] remote: don't resolve HEAD in non-repository
- From
Jeff King <peff@peff.net>
- Date
- Mar 5, 2016, 22:11 UTC
- Message-ID
- <20160305221157.GC31508@sigill.intra.peff.net>
- In-Reply-To
- <20160305220829.GA31316@sigill.intra.peff.net>
The remote-config code wants to look at HEAD to mark the current branch specially. But if we are not in a repository (e.g., running "git archive --remote"), this makes no sense; there is no HEAD to look at, and we have no current branch.
This doesn't really cause any bugs in practice (if you are not in a repo, you probably don't have a .git/HEAD file), but we should be more careful about triggering the refs code at all in a non-repo. As we grow new ref backends, we would not even know which backend to use.
Signed-off-by: Jeff King <peff@peff.net> --- remote.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/remote.c b/remote.c index fc02698..28fd676 100644 --- a/remote.c +++ b/remote.c @@ -455,7 +455,6 @@ static void read_config(void) { static int loaded; struct object_id oid; - const char *head_ref; int flag; if (loaded) @@ -463,10 +462,12 @@ static void read_config(void) loaded = 1; current_branch = NULL; - head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag); - if (head_ref && (flag & REF_ISSYMREF) && - skip_prefix(head_ref, "refs/heads/", &head_ref)) { - current_branch = make_branch(head_ref, 0); + if (startup_info->have_repository) { + const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag); + if (head_ref && (flag & REF_ISSYMREF) && + skip_prefix(head_ref, "refs/heads/", &head_ref)) { + current_branch = make_branch(head_ref, 0); + } } git_config(handle_config, NULL); alias_all_urls();
-- 2.8.0.rc1.318.g2193183