From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: 2.11.0-rc1 will not be tagged for a few days
Date: Mon, 7 Nov 2016 19:40:38 -0500 [thread overview]
Message-ID: <20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqk2cgc95m.fsf@gitster.mtv.corp.google.com>
On Sun, Nov 06, 2016 at 06:32:05PM -0800, Junio C Hamano wrote:
> I regret to report that I won't be able to tag 2.11-rc1 as scheduled
> in tinyurl.com/gitCal (I am feverish and my brain is not keeping
> track of things correctly) any time soon. I'll report back an
> updated schedule when able.
Take your time. Even if we end up bumping the release by a whole week, I
don't think it's a big deal (which seems likely given the holiday in the
middle, unless you really want to release on Thanksgiving).
> found on the list. I am aware of only two right now ("cast enum to
> int to work around compiler warning", in Dscho's prepare sequencer
> series, and "wc -l may give leading whitespace" fix J6t pointed out
> in Lars's filter process series), but it is more than likely that I
> am missing a few more.
In addition to J6t's fix in t0021, we need mine that you queued in
jk/filter-process-fix.
I think we also need to make a final decision on the indent/compaction
heuristic naming. After reading Michael's [0], and the claim by you and
Stefan that the "compaction" name was declared sufficiently experimental
that we could later take it away, I'm inclined to follow this plan:
1. Ship v2.11 with what is in master; i.e., both compaction and indent
heuristics, triggerable by config or command line.
2. Post-v2.11, retire the compaction heuristic as a failed experiment.
Keeping it in v2.11 doesn't hurt anything (it was already
released), and lets us take our time coming up with and cooking the
patch.
3. Post-v2.11, flip the default for diff.indentHeuristic to "true".
Keep at least the command line option around indefinitely for
experimenting (i.e., "this diff looks funny; I wonder if
--no-indent-heuristic makes it look better").
Config option can either stay or go at that point. I have no
preference.
The nice thing about that plan is it punts on merging any new code to
post-v2.11. :)
Another possible regression came up today in [1]. I haven't worked up a
patch yet, but I'll do so in the next day or so.
I think that's where we're at now. I'll keep collecting and can give you
the full list when you're back in action.
Get well.
[0] http://public-inbox.org/git/8dbbd28b-af60-5e66-ae27-d7cddca233dc@alum.mit.edu/
[1] http://public-inbox.org/git/20161108003034.apydvv3bav3s7ehq@sigill.intra.peff.net/
next prev parent reply other threads:[~2016-11-08 0:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 2:32 2.11.0-rc1 will not be tagged for a few days Junio C Hamano
2016-11-08 0:40 ` Jeff King [this message]
2016-11-08 6:25 ` Johannes Sixt
2016-11-08 21:48 ` Jeff King
2016-11-09 6:29 ` Junio C Hamano
2016-11-09 16:51 ` Jeff King
2016-11-09 23:35 ` Junio C Hamano
2016-11-09 23:40 ` Junio C Hamano
2016-11-10 21:43 ` Junio C Hamano
2016-11-11 0:26 ` Junio C Hamano
2016-11-11 16:13 ` Johannes Schindelin
2016-11-11 17:02 ` Johannes Schindelin
2016-11-11 17:05 ` Lars Schneider
2016-11-11 17:31 ` Lars Schneider
2016-11-11 17:38 ` Lars Schneider
2016-11-11 20:44 ` Johannes Sixt
2016-11-11 20:52 ` Junio C Hamano
2016-11-11 21:07 ` Junio C Hamano
2016-11-11 21:22 ` Johannes Sixt
2016-11-12 13:33 ` Lars Schneider
2016-11-11 17:41 ` Junio C Hamano
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=20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=larsxschneider@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).