From 510c5a8ee392fd2ab954b676bae486b53f444013 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Jan 2007 01:35:34 -0800 Subject: [PATCH] Move initialization of log_all_ref_updates The patches to prevent Porcelainish that require working tree from doing any damage in a bare repository make a lot of sense, and I want to make the is_bare_git_dir() function more reliable. In order to allow the repository owner override the heuristic implemented in is_bare_git_dir() if/when it misidentifies a particular repository, it would make sense to introduce a new configuration variable "[core] bare = true/false", and make is_bare_git_dir() notice it. The scripts would do a 'repo-config --bool --get core.bare' and iff the command fails (i.e. there is no such variable in the configuration file), it would use the heuristic implemented at the script level [*1*]. However, setup_git_env() which is called a lot earlier than we even read from the repository configuration currently makes a call to is_bare_git_dir(), in order to change the default setting for log_all_ref_updates. It somehow feels that this is a hack. By the way, [*1*] is another thing I hate about the current config mechanism. "git-repo-config --get" does not know what the possible configuration variables are, let alone what the default values for them are. It allows us not to maintain a centralized configuration table, which makes it easy to introduce ad-hoc variables and gives a warm fuzzy feeling of being modular, but my feeling is that it is turning out to be a rather high price to pay for scripts. Signed-off-by: Junio C Hamano --- environment.c | 5 ++--- refs.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/environment.c b/environment.c index 09976c7bf..64245e77a 100644 --- a/environment.c +++ b/environment.c @@ -15,7 +15,7 @@ int use_legacy_headers = 1; int trust_executable_bit = 1; int assume_unchanged; int prefer_symlink_refs; -int log_all_ref_updates; +int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; int repository_format_version; char *git_commit_encoding; @@ -51,10 +51,9 @@ static void setup_git_env(void) git_graft_file = getenv(GRAFT_ENVIRONMENT); if (!git_graft_file) git_graft_file = xstrdup(git_path("info/grafts")); - log_all_ref_updates = !is_bare_git_dir(git_dir); } -int is_bare_git_dir (const char *dir) +int is_bare_git_dir(const char *dir) { const char *s; if (!strcmp(dir, DEFAULT_GIT_DIR_ENVIRONMENT)) diff --git a/refs.c b/refs.c index 52057455a..b5eee11bd 100644 --- a/refs.c +++ b/refs.c @@ -923,6 +923,9 @@ static int log_ref_write(struct ref_lock *lock, char *logrec; const char *committer; + if (log_all_ref_updates < 0) + log_all_ref_updates = !is_bare_git_dir(get_git_dir()); + if (log_all_ref_updates && (!strncmp(lock->ref_name, "refs/heads/", 11) || !strncmp(lock->ref_name, "refs/remotes/", 13))) { -- 2.30.2