Delete ignore_env member in struct repository
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest4 patches 2 repliesIn review
- v24 patches 7 repliesSuperseded
- v14 patches 8 repliesSuperseded
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | repository.c: move env-related setup code back to environment.ccache.h environment.c repository.c +2 more | +79 | 0 replies | |
| 2/4 | repository.c: delete dead functionsrepository.c | +0 | 0 replies | |
| 3/4 | sha1_file.c: move delayed getenv(altdb) back to setup_git_env()environment.c object-store.h object.c +3 more | +10 | 0 replies | |
| 4/4 | repository: delete ignore_env memberrepository.c repository.h | +1 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.
Cover letter [PATCH v3 0/4] Delete ignore_env member in struct repository
v3 fixes comment style. Also since Brandon raised a question about shared_root, it's obviously not a good name, so I renamed it to commondir.
I still keep the delete patch 2/4, but I move the repo_setup_env() deletion back to 1/4 so all env logic is in one patch (the introduction of new helper functions in 1/4 and deletion in 2/4 are still diff noise if 2/4 is completely merged back).
Interdiff:
environment.c +3 -2
@@ -149,7 +149,8 @@ static char *expand_namespace(const char *raw_namespace)return strbuf_detach (&buf,NULL ); } -/* Wrapper of getenv() that returns a strdup value. This value is kept +/* +* Wrapper of getenv() that returns a strdup value. This value is kept * in argv to be freed later. */ static const char *getenv_safe (struct argv_array *argv,const char *name)
@@ -170,7 +171,7 @@ void setup_git_env(const char *git_dir)struct set_gitdir_args args = {NULL };struct argv_array to_free =ARGV_ARRAY_INIT ; - args.shared_root =getenv_safe (&to_free,GIT_COMMON_DIR_ENVIRONMENT ); + args.commondir =getenv_safe (&to_free,GIT_COMMON_DIR_ENVIRONMENT ); args.object_dir =getenv_safe (&to_free,DB_ENVIRONMENT ); args.graft_file =getenv_safe (&to_free,GRAFT_ENVIRONMENT ); args.index_file =getenv_safe (&to_free,INDEX_ENVIRONMENT );
repository.c +4 -4
@@ -27,15 +27,15 @@ static void expand_base_dir(char **out, const char *in, }static void repo_set_commondir (struct repository *repo, -const char *shared_root) +const char *commondir) {struct strbuf sb =STRBUF_INIT ;free (repo->commondir); -if (shared_root) { +if (commondir) { repo->different_commondir =1 ; - repo->commondir =xstrdup (shared_root); + repo->commondir =xstrdup (commondir);return ; }
@@ -58,7 +58,7 @@ void repo_set_gitdir(struct repository *repo, repo->gitdir =xstrdup (gitfile ? gitfile : root);free (old_gitdir); -repo_set_commondir (repo, o->shared_root); +repo_set_commondir (repo, o->commondir);expand_base_dir (&repo->objects.objectdir, o->object_dir, repo->commondir,"objects" );free (repo->objects.alternate_db);
repository.h +1 -1
@@ -81,7 +81,7 @@ struct repository {extern struct repository *the_repository;struct set_gitdir_args { -const char *shared_root; +const char *commondir;const char *object_dir;const char *graft_file;const char *index_file;
Nguyễn Thái Ngọc Duy (4):
repository.c: move env-related setup code back to environment.c repository.c: delete dead functions
sha1_file.c: move delayed getenv(altdb) back to setup_git_env()
repository: delete ignore_env member
cache.h | 2 +- environment.c | 31 +++++++++++++++++-- object-store.h | 5 ++- object.c | 1 + repository.c | 84 ++++++++++++++++++++++++-------------------------- repository.h | 21 +++++++------ setup.c | 3 +- sha1_file.c | 6 +--- 8 files changed, 87 insertions(+), 66 deletions(-)
Signature · 1 line
2.16.1.399.g632f88eed1