worktree.c: add find_worktree()

diff --git a/setup.c b/setup.c
index fbe7ec16dd2b2e73403aa92eed39004adc3f4767..1563cd42df2865d9f4390c9e68cdc666b45fcf96 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -6,6 +6,9 @@ static int inside_git_dir = -1;
 static int inside_work_tree = -1;
 static int work_tree_config_is_bogus;
 
+static struct startup_info the_startup_info;
+struct startup_info *startup_info = &the_startup_info;
+
 /*
  * The input parameter must contain an absolute path, and it must already be
  * normalized.
@@ -428,7 +431,6 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
                die("%s", err.buf);
        }
 
-       repository_format_version = candidate.version;
        repository_format_precious_objects = candidate.precious_objects;
        string_list_clear(&candidate.unknown_extensions, 0);
        if (!has_common) {
@@ -463,7 +465,7 @@ int verify_repository_format(const struct repository_format *format,
                             struct strbuf *err)
 {
        if (GIT_REPO_VERSION_READ < format->version) {
-               strbuf_addf(err, "Expected git repo version <= %d, found %d",
+               strbuf_addf(err, _("Expected git repo version <= %d, found %d"),
                            GIT_REPO_VERSION_READ, format->version);
                return -1;
        }
@@ -471,7 +473,7 @@ int verify_repository_format(const struct repository_format *format,
        if (format->version >= 1 && format->unknown_extensions.nr) {
                int i;
 
-               strbuf_addstr(err, "unknown repository extensions found:");
+               strbuf_addstr(err, _("unknown repository extensions found:"));
 
                for (i = 0; i < format->unknown_extensions.nr; i++)
                        strbuf_addf(err, "\n\t%s",
@@ -938,10 +940,9 @@ const char *setup_git_directory_gently(int *nongit_ok)
        else
                setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
 
-       if (startup_info) {
-               startup_info->have_repository = !nongit_ok || !*nongit_ok;
-               startup_info->prefix = prefix;
-       }
+       startup_info->have_repository = !nongit_ok || !*nongit_ok;
+       startup_info->prefix = prefix;
+
        return prefix;
 }
 
@@ -999,6 +1000,7 @@ int git_config_perm(const char *var, const char *value)
 void check_repository_format(void)
 {
        check_repository_format_gently(get_git_dir(), NULL);
+       startup_info->have_repository = 1;
 }
 
 /*