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

2017-06-08 Thread Brandon Williams
On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 7 Jun 2017, Brandon Williams wrote: > > > Looks good, I don't have any major issues with the series, just some > > comments for clarity mostly. > > Thank you for the review! Of course! I've been poking around the setup logic so thi

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

2017-06-08 Thread Johannes Schindelin
Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > Looks good, I don't have any major issues with the series, just some > comments for clarity mostly. Thank you for the review! I will wait a couple of hours to see whether anybody else sees anything that needs to be changed, before sendin

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

2017-06-07 Thread Brandon Williams
On 06/07, Johannes Schindelin wrote: > When expanding an alias in a subdirectory, we setup the git_dir > (gently), read the config, and then restore the "env" (e.g. the current > working directory) so that the command specified by the alias can run > correctly. > > What we failed to reset was the

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

2017-06-07 Thread Johannes Schindelin
Hi, On Wed, 7 Jun 2017, Johannes Schindelin wrote: > Johannes Schindelin (9): > 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 worktre

[PATCH 0/9] Avoid problem where git_dir is set after alias expansion

2017-06-07 Thread Johannes Schindelin
When expanding an alias in a subdirectory, we setup the git_dir (gently), read the config, and then restore the "env" (e.g. the current working directory) so that the command specified by the alias can run correctly. What we failed to reset was the git_dir, meaning that in the most common case, it