Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Junio C Hamano
Jeff King writes: > Good description. > > Signed-off-by: Jeff King > > of course. > >> @@ -1304,6 +1315,7 @@ test_expect_success '--show-origin with --get-regexp' ' >> file:$HOME/.gitconfig user.global true >> file:.git/config

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Jeff King
On Thu, Sep 29, 2016 at 02:03:39PM -0700, Junio C Hamano wrote: > > - git config --show-origin --get-regexp "user\.[g|l].*" >output && > > + git config --show-origin --get-regexp "user\.[g|l|s].*" >output && > > test_cmp expect output > > ' > > Makes sense modulo you inherited useless

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Junio C Hamano
Jeff King writes: > I just don't see it being a problem. Adding core.abbrev for the whole > test suite is just about not having a big flag day where we change all > the tests. Changing one or two tests (and again, I'd be surprised if we > even have to do that) doesn't seem like a

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Jeff King
On Thu, Sep 29, 2016 at 12:06:15PM -0700, Junio C Hamano wrote: > I think it deserves a separate patch and the result is more > understandable. I've queued this for now (on top of a revised 1/4 > that uses GIT_CONFIG_SYSTEM_PATH instead). Thanks, makes sense (and I like the new variable name

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Jeff King
On Thu, Sep 29, 2016 at 11:57:02AM -0700, Junio C Hamano wrote: > Jeff King writes: > > >> "either" meaning "we do not need to add --local and we do not need > >> GIT_CONFIG_NOSYSTEM"? > > > > Yes. I didn't test it with your core.abbrev patch 4/4, but I _didn't_ > > have to touch

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Junio C Hamano
Jeff King writes: > On Thu, Sep 29, 2016 at 11:13:45AM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> > I think anytime you would use GIT_CONFIG_NOSYSTEM over --local, it is an >> > indication that the test is trying to check how multiple sources >> >

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Junio C Hamano
Jeff King writes: >> "either" meaning "we do not need to add --local and we do not need >> GIT_CONFIG_NOSYSTEM"? > > Yes. I didn't test it with your core.abbrev patch 4/4, but I _didn't_ > have to touch their expected output after pointing them at a non-empty > etc-gitconfig file

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Jeff King
On Thu, Sep 29, 2016 at 11:13:45AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I think anytime you would use GIT_CONFIG_NOSYSTEM over --local, it is an > > indication that the test is trying to check how multiple sources > > interact. And the right thing to do for them

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Junio C Hamano
Jeff King writes: > I think anytime you would use GIT_CONFIG_NOSYSTEM over --local, it is an > indication that the test is trying to check how multiple sources > interact. And the right thing to do for them is to set GIT_ETC_GITCONFIG > to some known quantity. We just couldn't do

Re: [PATCH 2/4] t13xx: do not assume system config is empty

2016-09-29 Thread Jeff King
On Wed, Sep 28, 2016 at 04:30:45PM -0700, Junio C Hamano wrote: > The tests for show-origin codepath in "git config" however cannot be > tweaked with "--local" etc., because they wants to read also from > $HOME/.gitconfig and make sure what comes from where. Disable > reading from the