From: Brandon Williams <bmwill@google.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion
Date: Thu, 8 Jun 2017 15:32:37 -0700 [thread overview]
Message-ID: <20170608223237.GB121539@google.com> (raw)
In-Reply-To: <cover.1496951503.git.johannes.schindelin@gmx.de>
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
prev parent reply other threads:[~2017-06-08 22:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 19:53 [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 1/8] discover_git_directory(): avoid setting invalid git_dir Johannes Schindelin
2017-06-10 8:40 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 2/8] config: report correct line number upon error Johannes Schindelin
2017-06-10 9:04 ` Jeff King
2017-06-13 11:02 ` Johannes Schindelin
2017-06-13 11:28 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 3/8] help: use early config when autocorrecting aliases Johannes Schindelin
2017-06-10 9:05 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 4/8] read_early_config(): optionally return the worktree's top-level directory Johannes Schindelin
2017-06-10 9:44 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 5/8] t1308: relax the test verifying that empty alias values are disallowed Johannes Schindelin
2017-06-10 4:29 ` Junio C Hamano
2017-06-13 10:50 ` Johannes Schindelin
2017-06-13 12:59 ` Junio C Hamano
2017-06-08 19:53 ` [PATCH v2 6/8] t7006: demonstrate a problem with aliases in subdirectories Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 7/8] alias_lookup(): optionally return top-level directory Johannes Schindelin
2017-06-10 10:18 ` Jeff King
2017-06-13 11:21 ` Johannes Schindelin
2017-06-13 11:29 ` Jeff King
2017-06-13 11:42 ` Johannes Schindelin
2017-06-13 11:42 ` Jeff King
2017-06-13 16:40 ` Junio C Hamano
2017-06-14 6:02 ` Jeff King
2017-06-14 10:03 ` Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 8/8] Use the early config machinery to expand aliases Johannes Schindelin
2017-06-10 10:07 ` Jeff King
2017-06-10 10:10 ` Jeff King
2017-06-12 20:43 ` Junio C Hamano
2017-06-13 11:25 ` Johannes Schindelin
2017-06-13 11:30 ` Jeff King
2017-06-08 22:32 ` Brandon Williams [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170608223237.GB121539@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).