[PATCH 01/12] git wrapper: introduce startup_info struct
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 6, 2010, 02:40 UTC
- Message-ID
- <20100806024034.GC22369@burratino>
- In-Reply-To
- <20100806023529.GB22369@burratino>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
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> --- Changes from last round: - commit message - remove unnecessary memset (since statics are already automatically zero-initialized)
cache.h | 5 +++++ environment.c | 1 + git.c | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/cache.h b/cache.h index c9fa3df..0822c3b 100644 --- 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); +/* 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); diff --git a/environment.c b/environment.c index 83d38d3..eeb2687 100644 --- 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; +struct startup_info *startup_info; /* Parallel index stat data preload? */ int core_preload_index = 0; diff --git a/git.c b/git.c index 99517dd..8a8d2b2 100644 --- 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."; +static struct startup_info git_startup_info; 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; + startup_info = &git_startup_info; + cmd = git_extract_argv0_path(argv[0]); if (!cmd) cmd = "git-help";
-- 1.7.2.1.544.ga752d.dirty