Subject: Re: [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion

From: Brandon Williams <[email-masked]>
Date: Thu, 8 Jun 2017 15:32:37 -0700

On 06/08, Johannes Schindelin wrote:
> 
> Changes since v1:
> 
> - 1/8's commit message clarifies why the other early return in
>   discover_git_directory() does not need an equivalent resetting of
>   git_dir.
> 
> - 3/8's commit message fixes awkward language (thanks, Brandon!).
> 
> - the `worktree_dir` variables/parameters have been renamed to
>   `cdup_dir` to clarify that they only get populated if the search for
>   the .git/ directory determined that the current working directory
>   is a subdirectory of the directory containing .git/.
> 
> 

v2 addresses some of the comments I had with v1, so everything looks
good to me.

> Johannes Schindelin (8):
>   discover_git_directory(): avoid setting invalid git_dir
>   config: report correct line number upon error
>   help: use early config when autocorrecting aliases
>   read_early_config(): optionally return the worktree's top-level
>     directory
>   t1308: relax the test verifying that empty alias values are disallowed
>   t7006: demonstrate a problem with aliases in subdirectories
>   alias_lookup(): optionally return top-level directory
>   Use the early config machinery to expand aliases
> 
>  alias.c                | 33 +++++++++++++++++++++-------
>  builtin/help.c         |  2 +-
>  cache.h                |  7 +++---
>  config.c               |  7 +++---
>  git.c                  | 59 ++++++--------------------------------------------
>  help.c                 |  2 +-
>  pager.c                |  4 ++--
>  setup.c                | 13 +++++++++--
>  t/helper/test-config.c |  2 +-
>  t/t1308-config-set.sh  |  4 +++-
>  t/t7006-pager.sh       | 11 ++++++++++
>  11 files changed, 70 insertions(+), 74 deletions(-)

-- 
Brandon Williams