git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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 (Aug 2019, #01; Thu, 1)
Date: Thu, 1 Aug 2019 17:42:48 -0400	[thread overview]
Message-ID: <20190801214247.GB30522@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqv9vgmz2f.fsf@gitster-ct.c.googlers.com>

On Thu, Aug 01, 2019 at 01:05:12PM -0700, Junio C Hamano wrote:

> [Graduated to "master"]
> [...]
> * jk/repack-silence-auto-bitmap-warning (2019-07-31) 3 commits
>   (merged to 'next' on 2019-07-31 at 3aa218347c)
>  + repack: simplify handling of auto-bitmaps and .keep files
>  + repack: silence warnings when auto-enabled bitmaps cannot be built
>  + t7700: clean up .keep file in bitmap-writing test
> 
>  Squelch unneeded and misleading warnings from "repack" when the
>  command attempts to generate pack bitmaps without explicitly asked
>  for by the user.

After your "I need to digest this third one" comment in the thread, I
was surprised to see this merged so soon. :) I think it's fine, and I'd
be happy to see it in the upcoming release, but I just wanted to double
check that it was intentional.

> * jk/tree-walk-overflow (2019-07-31) 6 commits
>  - tree-walk: harden make_traverse_path() length computations
>  - tree-walk: add a strbuf wrapper for make_traverse_path()
>  - tree-walk: accept a raw length for traverse_path_len()
>  - tree-walk: use size_t consistently
>  - tree-walk: drop oid from traverse_info
>  - setup_traverse_info(): stop copying oid
> 
>  Codepaths to walk tree objects have been audited for integer
>  overflows and hardened.
> 
>  Will merge to 'next'.

Thanks. Stolee noted a minor typo fix in the commit message:

  https://public-inbox.org/git/b99561c9-cd7c-aca0-c7dd-a9916b7bd429@gmail.com/

if it's not too late / too much trouble to fix.

> * js/early-config-with-onbranch (2019-07-31) 1 commit
>   (merged to 'next' on 2019-08-01 at 26b713c824)
>  + config: work around bug with includeif:onbranch and early config
> 
>  The recently added [includeif "onbranch:branch"] feature does not
>  work well with an early config mechanism, as it attempts to find
>  out what branch we are on before we even haven't located the git
>  repository.  The inclusion during early config scan is ignored to
>  work around this issue.
> 
>  Will merge to 'master'.

I had some open comments here on how the "do we have a repo" check is
done, but I think what is committed here is functionally equivalent. I
can pursue the NULL the_repository cleanups separately.

> * jc/log-mailmap-flip-defaults (2019-08-01) 1 commit
>   (merged to 'next' on 2019-08-01 at 80cddd7895)
>  + log: flip the --mailmap default unconditionally

I think this one does need fixing to actually flip the default (I
responded in that thread, too).

-Peff

  reply	other threads:[~2019-08-01 21:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-01 20:05 What's cooking in git.git (Aug 2019, #01; Thu, 1) Junio C Hamano
2019-08-01 21:42 ` Jeff King [this message]
2019-08-02 12:12   ` js/early-config-with-onbranch, was " Johannes Schindelin
2019-08-02 18:38     ` Jeff King
2019-08-02 16:23   ` Junio C Hamano
2019-08-02 12:06 ` js/visual-studio, was " Johannes Schindelin
2019-08-02 16:42   ` Junio C Hamano
2019-08-03 20:22     ` Johannes Schindelin
2019-08-05 18:40       ` 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=20190801214247.GB30522@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).