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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B07EC1F462 for ; Mon, 29 Jul 2019 21:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729955AbfG2Vtc (ORCPT ); Mon, 29 Jul 2019 17:49:32 -0400 Received: from pb-sasl-trial21.pobox.com ([173.228.157.51]:61900 "EHLO pb-sasl-trial21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728233AbfG2Vtc (ORCPT ); Mon, 29 Jul 2019 17:49:32 -0400 Received: from pb-sasl-trial21.pobox.com (localhost.local [127.0.0.1]) by pb-sasl-trial21.pobox.com (Postfix) with ESMTP id F1DE81F3D9; Mon, 29 Jul 2019 17:49:30 -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=g W4wSHw0593m+ziEG4Zi0Bze7ho=; b=kyg4J7btn8jlFIg9ikNfn6yYNe8Yq8qCu aRA/v24ZlwykhSZBs9ld5fP20GnjCIgOdHmPfZL+VCO8kMVlulS+BqedMj7xdu9G OlyUC5liyi93CFu7mR3zvY7ciFId91ohObHp9UXcCfStfbvctVXDRy5eJ1CkMYmK t/Je7ATmGQ= 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=lrN 7o+1+WFLqDKFBRu6mD0wtWA5zxcRvZURaT/IZNfuIbvlY9HbBcsoFY2/RrzpRzNo A9Jnw/i302PiC5Rt+G0U8EicDXqVX0hXev/VXLDCgPD8g9k3IOM2mQ2su5DsieNw oT+MagMGy+6DKW1u1WMIVpcA2r3WycgEslihdMs4= Received: from pb-smtp20.sea.icgroup.com (pb-smtp20.pobox.com [10.110.30.20]) by pb-sasl-trial21.pobox.com (Postfix) with ESMTP id D48591F3D8; Mon, 29 Jul 2019 17:49:30 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id CCA2B85611; Mon, 29 Jul 2019 17:49:27 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Jul 2019, #07; Mon, 29) X-master-at: 026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8 X-next-at: 4dedae46a21fbd9d3232915177485ac88f42884f Date: Mon, 29 Jul 2019 14:49:25 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: BD020760-B24A-11E9-98DE-B0405B776F7B-77302942!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org 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 '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. The first preview for 2.23 has been tagged. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- [Graduated to "master"] * bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit (merged to 'next' on 2019-07-23 at 8bd5a68618) + grep: print the pcre2_jit_on value BUG() message fix. The codepath may want to just simply be removed, though. * jk/xdiff-clamp-funcname-context-index (2019-07-23) 1 commit (merged to 'next' on 2019-07-25 at b2944a0ba6) + xdiff: clamp function context indices in post-image The internal diff machinery can be made to read out of bounds while looking for --funcion-context line in a corner case, which has been corrected. * js/rebase-cleanup (2019-07-25) 2 commits (merged to 'next' on 2019-07-25 at 3d9cedf470) + git: mark cmd_rebase as requiring a worktree + rebase: fix white-space A few leftover cleanup to "git rebase" in C. * sg/travis-gcc-4.8 (2019-07-19) 1 commit (merged to 'next' on 2019-07-25 at e3d546eb15) + travis-ci: build with GCC 4.8 as well Add a job to build with a tad older GCC to make sure we are still buildable. -------------------------------------------------- [Stalled] * nd/index-dump-in-json (2019-06-26) 11 commits - SQUASH??? - t3008: use the new SINGLE_CPU prereq - read-cache.c: dump "IEOT" extension as json - read-cache.c: dump "EOIE" extension as json - resolve-undo.c: dump "REUC" extension as json - fsmonitor.c: dump "FSMN" extension as json - split-index.c: dump "link" extension as json - dir.c: dump "UNTR" extension as json - cache-tree.c: dump "TREE" extension as json - read-cache.c: dump common extension info in json - ls-files: add --json to dump the index "ls-files" learned "--debug-json" option to dump the contents and the extensions of the index file. At least the fixup at the tip needs to be squashed into the right commit. Also the new test seems flaky. * jn/unknown-index-extensions (2018-11-21) 2 commits - index: offer advice for unknown index extensions - index: do not warn about unrecognized extensions A bit too alarming warning given when unknown index extensions exist is getting revamped. Expecting a reroll. * jc/format-patch-delay-message-id (2019-04-05) 1 commit - format-patch: move message-id and related headers to the end The location "git format-patch --thread" adds the Message-Id: header in the series of header fields has been moved down, which may help working around a suspected bug in GMail MSA, reported at Waiting for feedback to see if it truly helps. Needs tests. * jt/fetch-cdn-offload (2019-03-12) 9 commits - SQUASH??? - upload-pack: send part of packfile response as uri - fetch-pack: support more than one pack lockfile - upload-pack: refactor reading of pack-objects out - Documentation: add Packfile URIs design doc - Documentation: order protocol v2 sections - http-fetch: support fetching packfiles by URL - http: improve documentation of http_pack_request - http: use --stdin when getting dumb HTTP pack WIP for allowing a response to "git fetch" to instruct the bulk of the pack contents to be instead taken from elsewhere (aka CDN). * js/protocol-advertise-multi (2018-12-28) 1 commit - protocol: advertise multiple supported versions The transport layer has been updated so that the protocol version used can be negotiated between the parties, by the initiator listing the protocol versions it is willing to talk, and the other side choosing from one of them. Expecting a reroll. cf. * mk/use-size-t-in-zlib (2018-10-15) 1 commit - zlib.c: use size_t for size The wrapper to call into zlib followed our long tradition to use "unsigned long" for sizes of regions in memory, which have been updated to use "size_t". * dl/remote-save-to-push (2018-12-11) 1 commit - remote: add --save-to-push option to git remote set-url "git remote set-url" learned a new option that moves existing value of the URL field to pushURL field of the remote before replacing the URL field with a new value. Anybody who wants to champion this topic? I am personally not yet quite convinced if this is worth pursuing. -------------------------------------------------- [Cooking] * vn/reset-deleted-ita (2019-07-26) 1 commit - reset: unstage empty deleted ita files "git reset HEAD []" did not reset an empty file that was added with the intent-to-add bit. Expecting a reroll. * cb/xdiff-no-system-includes-in-dot-c (2019-07-28) 3 commits (merged to 'next' on 2019-07-29 at 35ea0d8cba) + xdiff: remove duplicate headers from xpatience.c + xdiff: remove duplicate headers from xhistogram.c + xdiff: drop system includes in xutils.c (this branch uses jk/no-system-includes-in-dot-c.) Compilation fix. Will merge to 'master'. * jk/no-system-includes-in-dot-c (2019-06-19) 2 commits (merged to 'next' on 2019-07-29 at 8081b8c13d) + wt-status.h: drop stdio.h include + verify-tag: drop signal.h include (this branch is used by cb/xdiff-no-system-includes-in-dot-c.) Compilation fix. Will merge to 'master'. * ra/rebase-i-more-options (2019-07-23) 4 commits - SQUASH??? - rebase -i: support --committer-date-is-author-date - sequencer: add NULL checks under read_author_script - rebase -i: add --ignore-whitespace flag "git rebase -i" learned a few options that are known by "git rebase" proper. Needs a bit of fixups, at least. * js/rebase-r-strategy (2019-07-25) 12 commits - rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` - t3418: test `rebase -r` with merge strategies - t/lib-rebase: prepare for testing `git rebase --rebase-merges` - rebase -r: support merge strategies other than `recursive` - t3427: mark two test cases as requiring support for `git rebase -p` - t3427: fix another incorrect assumption - t3427: accommodate for the `rebase --merge` backend having been replaced - t3427: fix erroneous assumption - t3427: condense the unnecessarily repetitive test cases into three - t3427: move the `filter-branch` invocation into the `setup` case - t3427: simplify the `setup` test case significantly - t3427: add a clarifying comment "git rebase --rebase-merges" learned to drive different merge strategies and pass strategy specific options to them. * js/trace2-json-schema (2019-07-25) 3 commits . ci: run trace2 schema validation in the CI suite . trace2: add a schema validator for trace2 events . trace2: add a JSON schema for trace2 events The JSON output produced by "trace2" subsystem now has JSON schema defined on it, to allow us validate the output and catch deviation. The CI integration may be a bit too heavy-handed. * js/builtin-add-i (2019-07-18) 11 commits - built-in add -i: implement the `help` command - built-in add -i: use color in the main loop - built-in add -i: support `?` (prompt help) - built-in add -i: show unique prefixes of the commands - Add a function to determine unique prefixes for a list of strings - built-in add -i: implement the main loop - built-in add -i: color the header in the `status` command - built-in add -i: refresh the index before running `status` - built-in add -i: implement the `status` command - diff: export diffstat interface - Start to implement a built-in version of `git add --interactive` The beginning of rewriting "git add -i" in C. * js/visual-studio (2019-07-29) 23 commits - git: avoid calling aliased builtins via their dashed form - bin-wrappers: append `.exe` to target paths if necessary - .gitignore: ignore Visual Studio's temporary/generated files - .gitignore: touch up the entries regarding Visual Studio - vcxproj: also link-or-copy builtins - msvc: add a Makefile target to pre-generate the Visual Studio solution - contrib/buildsystems: add a backend for modern Visual Studio versions - contrib/buildsystems: handle options starting with a slash - contrib/buildsystems: also handle -lexpat - contrib/buildsystems: handle libiconv, too - contrib/buildsystems: handle the curl library option - contrib/buildsystems: error out on unknown option - contrib/buildsystems: optionally capture the dry-run in a file - contrib/buildsystems: redirect errors of the dry run into a log file - contrib/buildsystems: ignore gettext stuff - contrib/buildsystems: handle quoted spaces in filenames - contrib/buildsystems: fix misleading error message - contrib/buildsystems: ignore irrelevant files in Generators/ - contrib/buildsystems: ignore invalidcontinue.obj - Vcproj.pm: urlencode '<' and '>' when generating VC projects - Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool - Vcproj.pm: list git.exe first to be startup project - Vcproj.pm: auto-generate GUIDs Support building Git with Visual Studio The bits about .git/branches/* have been dropped from the series. We may want to drop the support for it, but until that happens, the tests should rely on the existence of the support to pass. * bc/hash-independent-tests-part-4 (2019-07-01) 10 commits (merged to 'next' on 2019-07-29 at d1efaea0ec) + t2203: avoid hard-coded object ID values + t1710: make hash independent + t1007: remove SHA1 prerequisites + t0090: make test pass with SHA-256 + t0027: make hash size independent + t6030: make test work with SHA-256 + t5000: make hash independent + t1450: make hash size independent + t1410: make hash size independent + t: add helper to convert object IDs to paths Update to the tests to help SHA-256 transition continues. Will merge to 'master'. * es/walken-tutorial (2019-07-02) 1 commit - documentation: add tutorial for revision walking Yet another revision walker tutorial. * ds/early-access (2019-07-01) 3 commits - repo-settings: pack.useSparse=true - repo-settings: use index.version=4 by default - repo-settings: create core.featureAdoptionRate setting A mechanism to enable newish configuration settings in bulk has been invented. Will replace with a redesigned variant which is being discussed when the dust settles. cf. (v2) * ab/no-kwset (2019-07-01) 10 commits (merged to 'next' on 2019-07-15 at ed0479ce3d) + grep: use PCRE v2 for optimized fixed-string search + grep: remove the kwset optimization + grep: drop support for \0 in --fixed-strings + grep: make the behavior for NUL-byte in patterns sane + grep tests: move binary pattern tests into their own file + grep tests: move "grep binary" alongside the rest + grep: inline the return value of a function call used only once + t4210: skip more command-line encoding tests on MinGW + grep: don't use PCRE2?_UTF8 with "log --encoding=" + log tests: test regex backends in "--encode=" tests (this branch is used by ab/pcre-jit-fixes.) Retire use of kwset library, which is an optimization for looking for fixed strings, with use of pcre2 JIT. Kicked out of 'next' to give the topic a chance to get rebooted. * ab/pcre-jit-fixes (2019-07-26) 7 commits - grep: do not enter PCRE2_UTF mode on fixed matching - grep: stess test PCRE v2 on invalid UTF-8 data - grep: create a "is_fixed" member in "grep_pat" - grep: consistently use "p->fixed" in compile_regexp() - grep: stop using a custom JIT stack with PCRE v1 - grep: stop "using" a custom JIT stack with PCRE v2 - grep: remove overly paranoid BUG(...) code (this branch uses ab/no-kwset.) A few simplification and bugfixes to PCRE interface. * md/list-objects-filter-combo (2019-06-28) 10 commits - list-objects-filter-options: make parser void - list-objects-filter-options: clean up use of ALLOC_GROW - list-objects-filter-options: allow mult. --filter - strbuf: give URL-encoding API a char predicate fn - list-objects-filter-options: make filter_spec a string_list - list-objects-filter-options: move error check up - list-objects-filter: implement composite filters - list-objects-filter-options: always supply *errbuf - list-objects-filter: put omits set in filter struct - list-objects-filter: encapsulate filter components The list-objects-filter API (used to create a sparse/lazy clone) learned to take a combined filter specification. Will merge to 'next'. * cc/multi-promisor (2019-06-25) 15 commits - Move core_partial_clone_filter_default to promisor-remote.c - Move repository_format_partial_clone to promisor-remote.c - Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} - remote: add promisor and partial clone config to the doc - partial-clone: add multiple remotes in the doc - t0410: test fetching from many promisor remotes - builtin/fetch: remove unique promisor remote limitation - promisor-remote: parse remote.*.partialclonefilter - Use promisor_remote_get_direct() and has_promisor_remote() - promisor-remote: use repository_format_partial_clone - promisor-remote: add promisor_remote_reinit() - promisor-remote: implement promisor_remote_get_direct() - Add initial support for many promisor remotes - fetch-object: make functions return an error code - t0410: remove pipes after git commands Teach the lazy clone machinery that there can be more than one promisor remote and consult them in order when downloading missing objects on demand. Will merge to 'next'. * jc/format-patch-noclobber (2019-02-22) 1 commit - format-patch: --no-clobber refrains from overwriting output files "git format-patch" used to overwrite an existing patch/cover-letter file. A new "--no-clobber" option stops it. Will discard. * dl/rebase-i-keep-base (2019-04-25) 6 commits - rebase: teach rebase --keep-base - rebase: fast-forward --fork-point in more cases - rebase: fast-forward --onto in more cases - rebase: refactor can_fast_forward into goto tower - t3432: test rebase fast-forward behavior - t3431: add rebase --fork-point tests "git rebase --keep-base " tries to find the original base of the topic being rebased and rebase on top of that same base, which is useful when running the "git rebase -i" (and its limited variant "git rebase -x"). The command also has learned to fast-forward in more cases where it can instead of replaying to recreate identical commits. On hold. cf. <20190508001252.15752-1-avarab@gmail.com> cf. <20190719210156.GA9688@archbookpro.localdomain>