@matheusbsbs / matheus-bagliano / commits / f1c126bd8b

setup: set startup_info->have_repository more reliably

When setup_git_directory() is called, we set a flag in startup_info to indicate we have a repository. But there are a few other mechanisms by which we might set up a repo: 1. When creating a new repository via init_db(), we transition from no-repo to being in a repo. We should tweak this flag at that moment. 2. In enter_repo(), a stricter form of setup_git_directory() used by server-side programs, we check the repository format config. After doing so, we know we're in a repository, and can set the flag. With these changes, library code can now reliably tell whether we are in a repository and act accordingly. We'll leave the "prefix" field as NULL, which is what happens when setup_git_directory() finds there is no prefix. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 5, 2016 at 17:11 UTC f1c126bd8b24ab7a78de33f4ba1f8a496e7245e2

2 files changed +4 -1

builtin/init-db.c

@@ -322,6 +322,7 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,

322 set_git_dir(real_path(git_dir));

323 git_link = NULL;

324 }

325 + startup_info->have_repository = 1;

326 return 0;

327 }

328

setup.c

+3 -1

@@ -986,7 +986,9 @@ int check_repository_format_version(const char *var, const char *value, void *cb

986

987 int check_repository_format(void)

988 {

989 - return check_repository_format_gently(get_git_dir(), NULL);

989 + check_repository_format_gently(get_git_dir(), NULL);

990 + startup_info->have_repository = 1;

991 + return 0;

992 }

993

994 /*