On Tue, Jun 26, 2018 at 12:47 AM, Junio C Hamano <gits...@pobox.com> wrote:
Happy 2.18.0 everyone! > * ab/fetch-tags-noclobber (2018-05-16) 9 commits > - fixup! push tests: assert re-pushing annotated tags > - fetch: stop clobbering existing tags without --force > - fetch tests: add a test clobbering tag behavior > - fetch tests: correct a comment "remove it" -> "remove them" > - push doc: correct lies about how push refspecs work > - push tests: assert re-pushing annotated tags > - push tests: add more testing for forced tag pushing > - push tests: fix logic error in "push" test assertion > - push tests: remove redundant 'git push' invocation > > Expecting a reboot of the discussion to take it to some conclusion > and then a reroll. > cf. <f3b891c3-381f-de42-51d8-24fdfbca9...@gmail.com> > cf. <xmqq603yn50l....@gitster-ct.c.googlers.com> > cf. <xmqqzi1alodz....@gitster-ct.c.googlers.com> > cf. <xmqqvabylnbi....@gitster-ct.c.googlers.com> I'm on vacation these days and won't submit a re-roll of this for 2-3 weeks, so I think it's best to eject it. I have a WIP re-roll of this. > * ab/checkout-default-remote (2018-06-11) 8 commits > - checkout & worktree: introduce checkout.defaultRemote > - checkout: add advice for ambiguous "checkout <branch>" > - builtin/checkout.c: use "ret" variable for return > - checkout: pass the "num_matches" up to callers > - checkout.c: change "unique" member to "num_matches" > - checkout.c: introduce an *_INIT macro > - checkout.h: wrap the arguments to unique_tracking_name() > - checkout tests: index should be clean after dwim checkout It would be nice to have this merged down. The only nit of the last version was SZEDER's suggestion of using a test helper in <20180605154501.13502-1-szeder....@gmail.com>. I agree, but as noted I won't be able to re-roll this for some time, and it would be nice to have it in next or master by then, I can then submit a tiny series on top to fix that "use a test helper" issue, which is something that can be improved in both the patch I'm submitting & in several existing places in the test suite, so I think it makes sense to address that as a subsequent cleanup series unrelated to this new feature.
