Re: [PATCH 0/4] Delete ignore_env member in struct repository
On Tue, Feb 27, 2018 at 3:46 AM, Stefan Bellerwrote: > What is the plan from here on? > Should I build further series on top of yours? The next series will > focus on the pack side of things (pack.h, packfile.{c,h}) > > So maybe we'll have Junio merge down my series (and yours as it > needs one reroll?) and then build on top of that? I think that's the less painful way for everybody. -- Duy
Re: [PATCH 0/4] Delete ignore_env member in struct repository
On Mon, Feb 26, 2018 at 2:30 AM, Nguyễn Thái Ngọc Duywrote: > It turns out I don't need my other series [1] in order to delete this > field. This series moves getenv() calls from > repo_set_gitdir()/repo_setup_env() and prepare_alt_odb() back in > environment.c where they belong in my opinion. > > The repo_set_gitdir() now takes $GIT_DIR and optionally all other > configurable paths. If those paths are NULL, default repo layout will > be used. With getenv() no longer called inside repo_set_gitdir(), > ignore_env has no reason to stay. This is in 1/4. > > The getenv() in prepare_alt_odb() is also moved back to > setup_git_env() in 3/4. It demonstrates how we could move other > getenv() back to if we want. > > This series is built on top of Stefan's object-store-part1, v4. I > could rebase it on 'master' too, but then Junio may need to resolve > some conflicts. > Thanks for working on this, I found this series a pleasant read, the only issue I saw was Erics upbringing of multiple getenv calls without strdup()ing the content. What is the plan from here on? Should I build further series on top of yours? The next series will focus on the pack side of things (pack.h, packfile.{c,h}) So maybe we'll have Junio merge down my series (and yours as it needs one reroll?) and then build on top of that? Thanks, Stefan
Re: [PATCH 0/4] Delete ignore_env member in struct repository
Nguyễn Thái Ngọc Duywrites: > This series is built on top of Stefan's object-store-part1, v4. I > could rebase it on 'master' too, but then Junio may need to resolve > some conflicts. As a follow-up fix for combined "move things to the_repo as much as possible" efforts I think what you did makes most sense. I would say that it makes even more sense to make these part of the object-store series if/when the series needs rerolling--after all the topic is already a multi-author effort. I'll have to read them carefully before commenting on the actual patches ;-) Thanks. > > [1] https://public-inbox.org/git/20180225111840.16421-1-pclo...@gmail.com/ > > 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 | 13 +++-- > object-store.h | 5 +++- > object.c | 1 + > repository.c | 79 ++ > repository.h | 21 +++--- > setup.c| 3 +- > sha1_file.c| 6 +--- > 8 files changed, 64 insertions(+), 66 deletions(-)
[PATCH 0/4] Delete ignore_env member in struct repository
It turns out I don't need my other series [1] in order to delete this field. This series moves getenv() calls from repo_set_gitdir()/repo_setup_env() and prepare_alt_odb() back in environment.c where they belong in my opinion. The repo_set_gitdir() now takes $GIT_DIR and optionally all other configurable paths. If those paths are NULL, default repo layout will be used. With getenv() no longer called inside repo_set_gitdir(), ignore_env has no reason to stay. This is in 1/4. The getenv() in prepare_alt_odb() is also moved back to setup_git_env() in 3/4. It demonstrates how we could move other getenv() back to if we want. This series is built on top of Stefan's object-store-part1, v4. I could rebase it on 'master' too, but then Junio may need to resolve some conflicts. [1] https://public-inbox.org/git/20180225111840.16421-1-pclo...@gmail.com/ 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 | 13 +++-- object-store.h | 5 +++- object.c | 1 + repository.c | 79 ++ repository.h | 21 +++--- setup.c| 3 +- sha1_file.c| 6 +--- 8 files changed, 64 insertions(+), 66 deletions(-) -- 2.16.1.435.g8f24da2e1a