From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] should these two topics graduate to 'master' soon?
Date: Tue, 28 Mar 2017 11:51:49 -0700 [thread overview]
Message-ID: <20170328185149.GS31294@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqshlxckr2.fsf@gitster.mtv.corp.google.com>
Hi Junio,
Junio C Hamano wrote:
> There are two topics that are marked as "Will cook in 'next'" for
> practically forever in the "What's cooking" reports. The world may
> have become ready for one or both of them, in which case we should
> do the merge not too late in the cycle.
>
> * jc/merge-drop-old-syntax (2015-04-29) 1 commit
>
> This topic stops "git merge <message> HEAD <commit>" syntax that
> has been deprecated since October 2007 (and we have issued a
> warning message since around v2.5.0 when the ancient syntax was
> used).
>
> * jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
>
> This is the endgame of the topic to avoid blindly falling back to
> ".git" when the setup sequence said we are _not_ in Git repository.
> A corner case that happens to work right now may be broken by a call
> to die("BUG").
>
> I am leaning toward including the former in the upcoming release,
> whose -rc0 is tentatively scheduled to happen on Apr 20th. I think
> the rest of the system is also ready for the latter (back when we
> merged it to 'next' and started cooking, there were still a few
> codepaths that triggered its die(), which have been fixed).
>
> Opinions?
Google has been running with both of these for a while. Any problems
we ran into were already reported and fixed. I would be all for
including them in the next release.
Thanks and hope that helps,
Jonathan
next prev parent reply other threads:[~2017-03-28 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 18:35 [RFC] should these two topics graduate to 'master' soon? Junio C Hamano
2017-03-28 18:51 ` Jonathan Nieder [this message]
2017-03-28 19:19 ` Jeff King
2017-03-30 19:18 ` Junio C Hamano
2017-03-28 18:57 ` Stefan Beller
2017-03-29 12:55 ` Jon Loeliger
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170328185149.GS31294@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox