From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: What's cooking in git.git (Jun 2018, #06; Mon, 25)
Date: Tue, 26 Jun 2018 13:07:29 +0200 [thread overview]
Message-ID: <CACBZZX4yG5h5kk4NFQz_NzAweMa+Nh3H-39OHtcH4XWsA6FGpg@mail.gmail.com> (raw)
In-Reply-To: <xmqqin66mql6.fsf@gitster-ct.c.googlers.com>
On Tue, Jun 26, 2018 at 12:47 AM, Junio C Hamano <gitster@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-24fdfbca91d2@gmail.com>
> cf. <xmqq603yn50l.fsf@gitster-ct.c.googlers.com>
> cf. <xmqqzi1alodz.fsf@gitster-ct.c.googlers.com>
> cf. <xmqqvabylnbi.fsf@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.dev@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.
prev parent reply other threads:[~2018-06-26 11:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 22:47 What's cooking in git.git (Jun 2018, #06; Mon, 25) Junio C Hamano
2018-06-26 9:28 ` ag/rebase-i-append-todo-help, was " Johannes Schindelin
2018-06-26 11:07 ` Ævar Arnfjörð Bjarmason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACBZZX4yG5h5kk4NFQz_NzAweMa+Nh3H-39OHtcH4XWsA6FGpg@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).