From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 0F0941F4B4 for ; Fri, 16 Apr 2021 00:04:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236434AbhDPAFE (ORCPT ); Thu, 15 Apr 2021 20:05:04 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:65185 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236263AbhDPAFD (ORCPT ); Thu, 15 Apr 2021 20:05:03 -0400 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 2C6EFC2157; Thu, 15 Apr 2021 20:04:39 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:mime-version:content-type; s=sasl; bh=q 2gPaPTF9NtTj0/Z0x1Go92iXJA=; b=C0dQcrDc0VPWTELaXS6WdaCk3aVa0A2JS k8EOTWBxf2TpOpnl8PFLAK7GApmRZ8tqqgDyMe2npb+zkK40qrw3MmEytlYhrRw0 IZ2z6tC6ApdJSVQR7lsyROrqyqg+y5S7IDH0SZ9oSIi7GU7mjNsYQEs0erbqq0Nj sq/oNLYiY8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:mime-version:content-type; q=dns; s=sasl; b=wOy cEI0v5QvM1SOsxqgrZ1Zdb+CK6m5BF0kX7x04AiMhVAN8++Tj4ZqfCGhxqe7RgNe Ii+jkiBDeOWlGS9apjsSRGZrniP18KqXddw1WtpgJV1hQhfYBNfrLhgBPwWsq/Cp FR0NOZVtFSo+LyniTHpmUHqlUSUBnOewrKwaPjHI= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 22D7AC2156; Thu, 15 Apr 2021 20:04:39 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 8FFECC2155; Thu, 15 Apr 2021 20:04:38 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Apr 2021, #04; Thu, 15) X-master-at: d1b10fc6d84d49796026e567833b88c7f8886c35 X-next-at: 2be84b2adec173cb8ec032d604b94d60c1637cb9 Date: Thu, 15 Apr 2021 17:04:37 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 55E7BD32-9E47-11EB-9ECE-74DE23BA3BAF-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Here are the topics that have been cooking. Commits prefixed with '-' are only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ab/complete-cherry-pick-head (2021-04-07) 1 commit (merged to 'next' on 2021-04-09 at 5810d0e2c2) + bash completion: complete CHERRY_PICK_HEAD The command line completion (in contrib/) has learned that CHERRY_PICK_HEAD is a possible pseudo-ref. * ab/detox-config-gettext (2021-04-08) 1 commit (merged to 'next' on 2021-04-08 at 01d6ff5069) + config.c: remove last remnant of GIT_TEST_GETTEXT_POISON The last remnant of gettext-poison has been removed. * ab/perl-do-not-abuse-map (2021-04-02) 1 commit (merged to 'next' on 2021-04-03 at 4eaf558557) + git-send-email: replace "map" in void context with "for" (this branch is used by ab/send-email-validate-errors.) Perl critique. * ab/send-email-validate-errors (2021-04-06) 3 commits (merged to 'next' on 2021-04-06 at d7fb1dbde0) + git-send-email: improve --validate error output + git-send-email: refactor duplicate $? checks into a function + git-send-email: test full --validate output (this branch uses ab/perl-do-not-abuse-map.) Clean-up codepaths that implements "git send-email --validate" option and improves the message from it. * cc/test-helper-bloom-usage-fix (2021-04-05) 1 commit (merged to 'next' on 2021-04-06 at 4895f33fee) + test-bloom: fix missing 'bloom' from usage string Usage message fix for a test helper. * fm/user-manual-use-preface (2021-04-03) 1 commit (merged to 'next' on 2021-04-05 at 0ae8f63207) + user-manual.txt: assign preface an id and a title Doc update to improve git.info * gk/gitweb-redacted-email (2021-04-08) 1 commit (merged to 'next' on 2021-04-08 at 8a19c3cd6e) + gitweb: add "e-mail privacy" feature to redact e-mail addresses "gitweb" learned "e-mail privacy" feature to redact strings that look like e-mail addresses on various pages. * jk/ref-filter-segfault-fix (2021-04-01) 1 commit (merged to 'next' on 2021-04-02 at 03596563b7) + ref-filter: fix NULL check for parse object failure A NULL-dereference bug has been corrected in an error codepath in "git for-each-ref", "git branch --list" etc. * jz/apply-3way-cached (2021-04-07) 1 commit (merged to 'next' on 2021-04-09 at 7d1e84936f) + git-apply: allow simultaneous --cached and --3way options (this branch uses jz/apply-run-3way-first.) "git apply" now takes "--3way" and "--cached" at the same time, and work and record results only in the index. * jz/apply-run-3way-first (2021-04-06) 1 commit (merged to 'next' on 2021-04-08 at f826bcc6b8) + git-apply: try threeway first when "--3way" is used (this branch is used by jz/apply-3way-cached.) "git apply --3way" has always been "to fall back to 3-way merge only when straight application fails". Swap the order of falling back so that 3-way is always attempted first (only when the option is given, of course) and then straight patch application is used as a fallback when it fails. * tb/pack-preferred-tips-to-give-bitmap (2021-03-31) 3 commits (merged to 'next' on 2021-04-03 at cd7024ecd8) + builtin/pack-objects.c: respect 'pack.preferBitmapTips' + t/helper/test-bitmap.c: initial commit + pack-bitmap: add 'test_bitmap_commits()' helper (this branch is used by tb/multi-pack-bitmaps.) A configuration variable has been added to force tips of certain refs to be given a reachability bitmap. * tb/precompose-prefix-simplify (2021-04-05) 2 commits (merged to 'next' on 2021-04-05 at 78e8ed11b7) + macOS: precompose startup_info->prefix + precompose_utf8: make precompose_string_if_needed() public Streamline the codepath to fix the UTF-8 encoding issues in the argv[] and the prefix on macOS. * vs/completion-with-set-u (2021-04-08) 1 commit (merged to 'next' on 2021-04-08 at b9b8bde89d) + completion: audit and guard $GIT_* against unset use The command-line completion script (in contrib/) had a couple of references that would have given a warning under the "-u" (nounset) option. -------------------------------------------------- [New Topics] * ab/detox-gettext-tests (2021-04-13) 1 commit (merged to 'next' on 2021-04-15 at db0da2903a) + tests: remove all uses of test_i18cmp Test clean-up. Will merge to 'master'. * ab/fsck-unexpected-type (2021-04-13) 6 commits - fsck: report invalid object type-path combinations - fsck: report invalid types recorded in objects - object-store.h: move read_loose_object() below 'struct object_info' - fsck: don't hard die on invalid object types - fsck tests: refactor one test to use a sub-repo - cache.h: move object functions to object-store.h "git fsck" has been taught to report mismatch between expected and actual types of an object better. * ab/usage-error-docs (2021-04-13) 3 commits (merged to 'next' on 2021-04-15 at dbbbaa5eea) + api docs: document that BUG() emits a trace2 error event + api docs: document BUG() in api-error-handling.txt + usage.c: don't copy/paste the same comment three times Documentation updates, with unrelated comment updates, too. Will merge to 'master'. * jk/promisor-optim (2021-04-13) 3 commits (merged to 'next' on 2021-04-15 at 41f303ef9b) + revision: avoid parsing with --exclude-promisor-objects + lookup_unknown_object(): take a repository argument + is_promisor_object(): free tree buffer after parsing (this branch is used by rs/repack-without-loosening-promised-objects.) Handling of "promisor packs" that allows certain objects to be missing and lazily retrievable has been optimized (a bit). Will merge to 'master'. * so/log-diff-merge (2021-04-13) 5 commits - doc/diff-options: document new --diff-merges features - diff-merges: introduce log.diffMerges config variable - diff-merges: adapt -m to enable default diff format - diff-merges: refactor set_diff_merges() - diff-merges: introduce --diff-merges=on "git log" learned "--diff-merges=