From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Date: Mon, 4 Jun 2018 10:12:30 -0400 [thread overview]
Message-ID: <20180604141230.GA26961@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr2lm4pth.fsf@gitster-ct.c.googlers.com>
On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano wrote:
> * jk/index-pack-maint (2018-06-01) 2 commits
> (merged to 'next' on 2018-06-04 at c553a485e8)
> + index-pack: handle --strict checks of non-repo packs
> + prepare_commit_graft: treat non-repository as a noop
>
> "index-pack --strict" has been taught to make sure that it runs the
> final object integrity checks after making the freshly indexed
> packfile available to itself.
>
> Will cook in 'next'.
This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I
don't know if we'd want to consider it for v2.18 or not (it should be
able to be applied independently from the first).
> * jk/branch-l-0-deprecation (2018-05-25) 5 commits
> (merged to 'next' on 2018-05-30 at a94574dfd5)
> + branch: customize "-l" warning in list mode
> + branch: issue "-l" deprecation warning after pager starts
> (merged to 'next' on 2018-04-11 at 9b2b0305dd)
> + branch: deprecate "-l" option
> + t: switch "branch -l" to "branch --create-reflog"
> + t3200: unset core.logallrefupdates when testing reflog creation
> (this branch is used by jk/branch-l-1-removal and jk/branch-l-2-reincarnation.)
>
> The "-l" option in "git branch -l" is an unfortunate short-hand for
> "--create-reflog", but many users, both old and new, somehow expect
> it to be something else, perhaps "--list". This step deprecates
> the short-hand and warns about the future removal of the it when it
> is used.
>
> Will cook in 'next'.
> Perhaps merge to 'master' immediately after 2.18 release?
FWIW, I plan to re-roll this according to the discussion (with the
intent that this would just get ejected when 'next' is rewound). But
there is no rush, since that is all post-release. So you can see if I
get around to it or not by then. ;)
-Peff
next prev parent reply other threads:[~2018-06-04 14:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 13:57 What's cooking in git.git (Jun 2018, #02; Mon, 4) Junio C Hamano
2018-06-04 14:12 ` Jeff King [this message]
2018-06-11 22:08 ` Junio C Hamano
2018-06-11 22:30 ` Jeff King
2018-06-11 22:35 ` Junio C Hamano
2018-06-04 14:18 ` SZEDER Gábor
2018-06-04 14:50 ` Jeff King
2018-06-04 14:26 ` Luke Diamand
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=20180604141230.GA26961@sigill.intra.peff.net \
--to=peff@peff.net \
--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.
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).