Re: [PATCH v3 6/6] Use the early config machinery to expand aliases
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jun 14, 2017, 10:20 UTC
- Message-ID
- <alpine.DEB.2.21.1.1706141219260.171564@virtualbox>
- In-Reply-To
- <xmqqk24f97ud.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Tue, 13 Jun 2017, Junio C Hamano wrote:
Show 8 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes: > > > Instead of discovering the .git/ directory, read the config and then > > trying to painstakingly reset all the global state if we did not find a > > matching alias, let's use the early config machinery instead. > > s/read/&ing/, I think. My reading hiccupped while trying to figure > out what two alternative approaches are being compared.
Whoa. Brainfart on my side. Sorry.
Show 11 quoted lines
> > Also, one might be tempted to streamline the code in alias_lookup() to > > *not* use a strbuf for the key. However, if the config reports an error, > > it is far superior to tell the user that the `alias.xyz` key had a > > problem than to claim that it was the `xyz` key. > > The mention of "streamline" is puzzling to me. When we are trying > "git xyz", "alias.xyz" is the key we would look up, not "xyz"; it is > not clear to anybody who didn't read the discussion on v2 (which > includes the readers of "git log" in a few months) what kind of flawed > streamlining could look up "xyz" and result in a bad configuration > reported on it.
As I changed it (thanks for pointing out my mistake to assume that skip_prefix() has to change the pointer passed as first parameter), this paragraph is now gone anyway.
Show 6 quoted lines
> > alias.c | 31 ++++++++++++++++++++++++------- > > git.c | 55 ++++--------------------------------------------------- > > t/t7006-pager.sh | 2 +- > > 3 files changed, 29 insertions(+), 59 deletions(-) > > Happy to see the deletion of all the save/restore-env stuff.
Yep.
Ciao, Dscho