From: Jeff King <peff@peff.net>
To: David Turner <dturner@twopensource.com>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu, pclouds@gmail.com
Subject: Re: [PATCH v6 28/32] config: read ref storage config on startup
Date: Mon, 29 Feb 2016 17:21:07 -0500 [thread overview]
Message-ID: <20160229222107.GA18931@sigill.intra.peff.net> (raw)
In-Reply-To: <20160229221024.GE25342@sigill.intra.peff.net>
On Mon, Feb 29, 2016 at 05:10:24PM -0500, Jeff King wrote:
> > We apparently don't always call check_repo_format before calling
> > git_config_early -- or, more to the point, before doing ref operations.
> > So I think we need this in git_config_early.
>
> That seems horribly broken, though. If a program is accessing refs
> without calling check_repository_format, isn't it bypassing all of our
> regular version and extension checks?
>
> I think we should be smoking out such cases (e.g., by setting
> a null refs-backend, as I mentioned earlier) and fixing them, rather
> than working around them by putting the backend setup in the wrong
> place.
So even without your series, this isn't too bad to instrument, like the
patch below.
It does reveal a handful of failures in the test suite. I haven't dug
yet, but I strongly suspect those are all bugs that should be fixed.
diff --git a/cache.h b/cache.h
index af2aeb8..a286f99 100644
--- a/cache.h
+++ b/cache.h
@@ -639,6 +639,7 @@ extern int hold_locked_index(struct lock_file *, int);
extern void set_alternate_index_output(const char *);
/* Environment bits from configuration mechanism */
+extern int repo_initialized;
extern int trust_executable_bit;
extern int trust_ctime;
extern int check_stat;
diff --git a/environment.c b/environment.c
index 10451ee..6ee9812 100644
--- a/environment.c
+++ b/environment.c
@@ -12,6 +12,7 @@
#include "fmt-merge-msg.h"
#include "commit.h"
+int repo_initialized;
int trust_executable_bit = 1;
int trust_ctime = 1;
int check_stat = 1;
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 339f5c7..a4e9df6 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -947,6 +947,9 @@ static struct ref_cache *lookup_ref_cache(const char *submodule)
{
struct ref_cache *refs;
+ if (!repo_initialized)
+ die("BUG: lookup_ref_cache called without initializing repo");
+
if (!submodule || !*submodule)
return &ref_cache;
@@ -1414,6 +1417,9 @@ static const char *resolve_ref_1(const char *refname,
int depth = MAXDEPTH;
int bad_name = 0;
+ if (!repo_initialized)
+ die("BUG: resolve_ref called without initializing repo");
+
if (flags)
*flags = 0;
diff --git a/setup.c b/setup.c
index 76609fa..ed86094 100644
--- a/setup.c
+++ b/setup.c
@@ -446,6 +446,9 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
ret = -1;
}
+ if (ret == 0)
+ repo_initialized = 1;
+
strbuf_release(&sb);
return ret;
}
next prev parent reply other threads:[~2016-02-29 22:21 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 22:58 [PATCH v6 00/32] refs backend David Turner
2016-02-24 22:58 ` [PATCH v6 01/32] refs: move head_ref{,_submodule} to the common code David Turner
2016-02-24 22:58 ` [PATCH v6 02/32] refs: move for_each_*ref* functions into " David Turner
2016-02-24 22:58 ` [PATCH v6 03/32] files-backend: break out ref reading David Turner
2016-02-25 0:21 ` Junio C Hamano
2016-02-25 0:51 ` Junio C Hamano
2016-02-25 20:11 ` David Turner
2016-02-25 20:27 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 04/32] refs: move resolve_ref_unsafe into common code David Turner
2016-02-25 0:22 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 05/32] refs: add a backend method structure with transaction functions David Turner
2016-02-27 4:06 ` Jeff King
2016-02-29 20:43 ` David Turner
2016-02-24 22:58 ` [PATCH v6 06/32] refs: add methods for misc ref operations David Turner
2016-02-24 22:58 ` [PATCH v6 07/32] refs: add method for do_for_each_ref David Turner
2016-02-24 22:58 ` [PATCH v6 08/32] refs: reduce the visibility of do_for_each_ref() David Turner
2016-02-24 22:58 ` [PATCH v6 09/32] refs: add do_for_each_per_worktree_ref David Turner
2016-02-24 22:58 ` [PATCH v6 10/32] refs: add methods for reflog David Turner
2016-02-24 22:58 ` [PATCH v6 11/32] refs: add method for initial ref transaction commit David Turner
2016-02-24 22:58 ` [PATCH v6 12/32] refs: add method for delete_refs David Turner
2016-02-24 22:58 ` [PATCH v6 13/32] refs: add methods to init refs db David Turner
2016-02-24 22:58 ` [PATCH v6 14/32] refs: add method to rename refs David Turner
2016-02-24 22:58 ` [PATCH v6 15/32] refs: handle non-normal ref renames David Turner
2016-02-24 22:58 ` [PATCH v6 16/32] refs: make lock generic David Turner
2016-02-24 22:58 ` [PATCH v6 17/32] refs: move duplicate check to common code David Turner
2016-02-24 22:58 ` [PATCH v6 18/32] refs: allow log-only updates David Turner
2016-02-24 22:58 ` [PATCH v6 19/32] refs: don't dereference on rename David Turner
2016-02-24 22:58 ` [PATCH v6 20/32] refs: on symref reflog expire, lock symref not referrent David Turner
2016-02-24 22:58 ` [PATCH v6 21/32] refs: resolve symbolic refs first David Turner
2016-02-24 22:58 ` [PATCH v6 22/32] refs: always handle non-normal refs in files backend David Turner
2016-02-24 22:58 ` [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-24 22:58 ` [PATCH v6 24/32] refs: check submodules' ref storage config David Turner
2016-02-24 22:58 ` [PATCH v6 25/32] clone: allow ref storage backend to be set for clone David Turner
2016-02-24 22:58 ` [PATCH v6 26/32] svn: learn ref-storage argument David Turner
2016-02-24 22:58 ` [PATCH v6 27/32] refs: register ref storage backends David Turner
2016-02-24 22:59 ` [PATCH v6 28/32] config: read ref storage config on startup David Turner
2016-02-27 3:56 ` Jeff King
2016-02-27 4:14 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:13 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:10 ` Jeff King
2016-02-29 22:21 ` Jeff King [this message]
2016-02-29 22:59 ` David Turner
2016-02-24 22:59 ` [PATCH v6 29/32] refs: break out resolve_ref_unsafe_submodule David Turner
2016-02-24 22:59 ` [PATCH v6 30/32] refs: add LMDB refs storage backend David Turner
2016-02-24 22:59 ` [PATCH v6 31/32] refs: tests for lmdb backend David Turner
2016-02-24 22:59 ` [PATCH v6 32/32] tests: add ref-storage argument David Turner
2016-02-29 22:52 ` SZEDER Gábor
2016-02-29 23:50 ` David Turner
2016-02-25 0:08 ` [PATCH v6 00/32] refs backend Ramsay Jones
2016-02-25 19:32 ` David Turner
2016-02-25 12:57 ` Duy Nguyen
2016-02-25 19:27 ` David Turner
2016-02-25 19:31 ` Stefan Beller
2016-02-25 20:31 ` Duy Nguyen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160229222107.GA18931@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
/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.
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 NNTP newsgroup(s).