[PATCH] Take it easy on unallowed access to non-existent repository
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
2010/4/9 Jeff King <peff@peff.net>:
> Yeah, that sounds reasonable, especially if merging this to 'next' would
> make git unusable. We want to shake out bugs, not punish people running
> next. :) But I haven't even really looked at the topic in detail yet.
This patch could be squashed into 551a5786 (Guard unallowed access to repository..)
Still don't know what to do with "git ls-remote". I'm not familiar with it.
config.c | 2 +-
environment.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c
index 9981b09..63702bf 100644
--- a/config.c
+++ b/config.c
@@ -738,7 +738,7 @@ int git_config(config_fn_t fn, void *data)
int ret;
if (startup_info && !startup_info->have_run_setup_gitdir)
- die("internal error: access to .git/config without repo setup");
+ warning("Broken repository setup: early access to $GIT_DIR/config");
if (!startup_info || startup_info->have_repository)
repo_config = git_pathdup("config");
ret = git_config_early(fn, data, repo_config);
diff --git a/environment.c b/environment.c
index 28624ad..dbaed04 100644
--- a/environment.c
+++ b/environment.c
@@ -99,7 +99,7 @@ void unset_git_env(void)
static void setup_git_env(void)
{
if (startup_info && startup_info->have_run_setup_gitdir)
- die("internal error: setup_git_env can't be called twice");
+ warning("Broken repository setup: setup_git_env() called twice");
git_dir = getenv(GIT_DIR_ENVIRONMENT);
if (!git_dir) {
/*
@@ -107,7 +107,7 @@ static void setup_git_env(void)
* or enter_repo, not by this function
*/
if (startup_info)
- die("internal error: $GIT_DIR is empty");
+ warning("Broken respository setup: git_dir is empty");
git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
}
if (!git_dir)
--
1.7.0.rc1.541.g2da82.dirty
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>