On 02/17, Johannes Schindelin wrote: > Hi Peff & Thomas, > > On Mon, 15 Feb 2016, Jeff King wrote: > > This original is quite confusing. I thought at first that there was > > perhaps something going on with allowing repeated re-configuration of > > the same remote, as long as some parameters matched. I.e., I am > > wondering if there is a case here that does _not_ segfault, that we > > would be breaking. > > > > But reading over fb86e32dcc, I think I have convinced myself that it was > > merely an ad-hoc check for "is_configured", and using that function is a > > better replacement. > > Yes, yes, yes. Y'all are absolutely correct. I shoulda added a test case > right away, to make sure not only that what I fixed does not get broken in > the future, but also to document *what* was fixed, exactly.
Thanks for confirming and the test case so we don't break it again. > So, belatedly, here goes a patch that verifies what that commit was > supposed to fix, and yes, it passes with Thomas' changes (Junio, would you > please apply this on top of tg/git-remote?): > > -- snipsnap -- > From: Johannes Schindelin <johannes.schinde...@gmx.de> > Date: Wed, 17 Feb 2016 14:45:59 +0100 > Subject: [PATCH] t5505: 'remote add x y' should work when url.y.insteadOf = x > > This is the test missing from fb86e32 (git remote: allow adding > remotes agreeing with url.<...>.insteadOf, 2014-12-23): we should > allow adding a remote with the URL when it agrees with the > url.<...>.insteadOf setting. > > Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> > --- > t/t5505-remote.sh | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh > index 94079a0..19e8e34 100755 > --- a/t/t5505-remote.sh > +++ b/t/t5505-remote.sh > @@ -51,6 +51,11 @@ test_expect_success setup ' > git clone one test > ' > > +test_expect_success 'add remote whose URL agrees with url.<...>.insteadOf' ' > + git config url....@host.com:team/repo.git.insteadOf myremote && Minor nit: I think we should use test_config here. > + git remote add myremote g...@host.com:team/repo.git > +' > + > test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' ' > ( > cd test && > -- > 2.7.1.windows.2 -- Thomas -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
