git wrapper: introduce startup_info struct

The startup_info struct will collect information managed by the git
setup code, such as the prefix for relative paths passed on the
command line (i.e., path to the starting cwd from the toplevel of
the work tree) and whether a git repository has been found.

In other words, startup_info is intended to be a collection of global
variables with results that were previously returned from setup
functions.  This state is global anyway (since the cwd is), even
if it is not currently tracked that way.  Letting these values persist
means there is more flexibility in deciding when to run setup.

For now, the struct is empty.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index c9fa3df7f5b343ecea980ceb423e7c23d2eb22b2..0822c3b8be4cbcfb5c7e8078b5bf4e41797a392e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1097,6 +1097,11 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);
 
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);
 

+/* git.c */
+struct startup_info {
+};
+extern struct startup_info *startup_info;
+

 /* builtin/merge.c */
 int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
 
 /* builtin/merge.c */
 int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
 

diff --git a/environment.c b/environment.c
index 83d38d3c2354e8582d5af91c6d529a2f2836dc2c..eeb26876a181f57fcdf5fd324c06a90c705623dc 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -53,6 +53,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;

+struct startup_info *startup_info;

 
 /* Parallel index stat data preload? */
 int core_preload_index = 0;
 
 /* Parallel index stat data preload? */
 int core_preload_index = 0;

diff --git a/git.c b/git.c
index f37028b3b722e6203ae8dac1ccf40a94421597d2..c4b6dbea36ac124c7663af13acc0974330ea1e39 100644 (file)
--- a/git.c
+++ b/git.c
@@ -14,6 +14,7 @@ const char git_usage_string[] =
 const char git_more_info_string[] =
        "See 'git help COMMAND' for more information on a specific command.";
 
 const char git_more_info_string[] =
        "See 'git help COMMAND' for more information on a specific command.";
 

+static struct startup_info git_startup_info;

 static int use_pager = -1;
 struct pager_config {
        const char *cmd;
 static int use_pager = -1;
 struct pager_config {
        const char *cmd;


@@ -489,6 +490,8 @@ int main(int argc, const char **argv)
 {
        const char *cmd;
 
 {
        const char *cmd;
 

+       startup_info = &git_startup_info;
+

        cmd = git_extract_argv0_path(argv[0]);
        if (!cmd)
                cmd = "git-help";
        cmd = git_extract_argv0_path(argv[0]);
        if (!cmd)
                cmd = "git-help";