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.0 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 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 1AD531F87F for ; Wed, 21 Nov 2018 09:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729128AbeKUTeF (ORCPT ); Wed, 21 Nov 2018 14:34:05 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:57350 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbeKUTeF (ORCPT ); Wed, 21 Nov 2018 14:34:05 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id AECA210FBB1; Wed, 21 Nov 2018 04:00:18 -0500 (EST) 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 laeSWpNlnnaRrrp74EPdVEAcbI=; b=SY1bBsCLJEp6C4q6xIRK0d2A26Rpy1QJu WO7nYI8k6OL553fDGCeVYeH6DEVJgG2L+Gbx+ZZCU0QPb1Yds4jZPNqfleOpJ12f GXmYz3bISJ0f1w1SRsuAmqCzSYIAdrlItu+9cynUn2cPJ6kEoc8PGl7ngkWVdSuT 1UPsfcB8lQ= 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=b9w gusLz/kVc0xNtVpTfzB6Qn9+iB7eKxJbl6fK6das0pj306Yx1fwpF2SMRM9CZiaw B4ktWT81csh5KNcFaObVx//fXIWmOxgSMlb4VRKrnzdOadLddy1gG80XWFci7AT7 gau8XgDq8CejXpdnBnH7FcQn0Q3RxV7YVPdp+GTQ= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id A6E7010FBB0; Wed, 21 Nov 2018 04:00:18 -0500 (EST) Received: from pobox.com (unknown [35.187.50.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id EB2BC10FBAF; Wed, 21 Nov 2018 04:00:17 -0500 (EST) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Nov 2018, #06; Wed, 21) X-master-at: bb75be6cb916297f271c846f2f9caa3daaaec718 X-next-at: 68bc7959f8dc2d629c09be1a52f1b95b977b3a13 Date: Wed, 21 Nov 2018 18:00:16 +0900 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: DE2FC836-ED6B-11E8-91B3-063AD72159A7-77302942!pb-smtp1.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 group of last-minute fixes marked as "Will merge to 'master'" hopefully will be part of -rc1. 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"] * ab/dynamic-gettext-poison (2018-11-09) 2 commits (merged to 'next' on 2018-11-18 at 13247a3be6) + Makefile: ease dynamic-gettext-poison transition + i18n: make GETTEXT_POISON a runtime option Our testing framework uses a special i18n "poisoned localization" feature to find messages that ought to stay constant but are incorrectly marked to be translated. This feature has been made into a runtime option (it used to be a compile-time option). * ab/range-diff-no-patch (2018-11-14) 3 commits (merged to 'next' on 2018-11-17 at c42e0891d0) + range-diff: make diff option behavior (e.g. --stat) consistent + range-diff: fix regression in passing along diff options + range-diff doc: add a section about output stability The "--no-patch" option, which can be used to get a high-level overview without the actual line-by-line patch difference shown, of the "range-diff" command was earlier broken, which has been corrected. * ab/rebase-in-c-escape-hatch (2018-11-16) 2 commits (merged to 'next' on 2018-11-17 at a01be221c7) + tests: add a special setup where rebase.useBuiltin is off + rebase doc: document rebase.useBuiltin The recently merged "rebase in C" has an escape hatch to use the scripted version when necessary, but it hasn't been documented, which has been corrected. * ag/p3400-force-checkout (2018-11-12) 1 commit (merged to 'next' on 2018-11-17 at 87ff48d52a) + p3400: replace calls to `git checkout -b' by `git checkout -B' Perf test tweak. * cb/notes-freeing-always-null-fix (2018-11-13) 1 commit (merged to 'next' on 2018-11-17 at 47aeec5fc9) + builtin/notes: remove unnecessary free Code cleanup. * dd/poll-dot-h (2018-11-14) 1 commit (merged to 'next' on 2018-11-18 at b6745f3308) + git-compat-util: prefer poll.h to sys/poll.h A build update. * ds/push-squelch-ambig-warning (2018-11-07) 1 commit (merged to 'next' on 2018-11-18 at 5e8b3db129) + pack-objects: ignore ambiguous object warnings "git push" used to check ambiguities between object-names and refnames while processing the list of refs' old and new values, which was unnecessary (as it knew that it is feeding raw object names). This has been optimized out. * ds/reachable-topo-order (2018-11-02) 7 commits (merged to 'next' on 2018-11-13 at 4155d01aee) + t6012: make rev-list tests more interesting + revision.c: generation-based topo-order algorithm + commit/revisions: bookkeeping before refactoring + revision.c: begin refactoring --topo-order logic + test-reach: add rev-list tests + test-reach: add run_three_modes method + prio-queue: add 'peek' operation The revision walker machinery learned to take advantage of the commit generation numbers stored in the commit-graph file. * jk/close-duped-fd-before-unlock-for-bundle (2018-11-17) 1 commit (merged to 'next' on 2018-11-17 at 2fe598284e) + bundle: dup() output descriptor closer to point-of-use When "git bundle" aborts due to an empty commit ranges (i.e. resulting in an empty pack), it left a file descriptor to an lockfile open, which resulted in leftover lockfile on Windows where you cannot remove a file with an open file descriptor. This has been corrected. * jk/curl-ldflags (2018-11-05) 1 commit (merged to 'next' on 2018-11-13 at d1387a3aa0) + build: link with curl-defined linker flags The way -lcurl library gets linked has been simplified by taking advantage of the fact that we can just ask curl-config command how. * jk/unused-parameter-fixes (2018-11-06) 14 commits (merged to 'next' on 2018-11-13 at 8d3625b4ae) + midx: double-check large object write loop + assert NOARG/NONEG behavior of parse-options callbacks + parse-options: drop OPT_DATE() + apply: return -1 from option callback instead of calling exit(1) + cat-file: report an error on multiple --batch options + tag: mark "--message" option with NONEG + show-branch: mark --reflog option as NONEG + format-patch: mark "--no-numbered" option with NONEG + status: mark --find-renames option with NONEG + cat-file: mark batch options with NONEG + pack-objects: mark index-version option as NONEG + ls-files: mark exclude options as NONEG + am: handle --no-patch-format option + apply: mark include/exclude options as NONEG Various functions have been audited for "-Wunused-parameter" warnings and bugs in them got fixed. * jk/verify-sig-merge-into-void (2018-11-07) 3 commits (merged to 'next' on 2018-11-13 at a207be60ed) + pull: handle --verify-signatures for unborn branch + merge: handle --verify-signatures for unborn branch + merge: extract verify_merge_signature() helper "git merge" and "git pull" that merges into an unborn branch used to completely ignore "--verify-signatures", which has been corrected. * js/apply-recount-allow-noop (2018-11-13) 1 commit (merged to 'next' on 2018-11-17 at e413fa105f) + apply --recount: allow "no-op hunks" When editing a patch in a "git add -i" session, a hunk could be made to no-op. The "git apply" program used to reject a patch with such a no-op hunk to catch user mistakes, but it is now updated to explicitly allow a no-op hunk in an edited patch. * js/builtin-rebase-perf-fix (2018-11-13) 3 commits (merged to 'next' on 2018-11-17 at 9e9db8c8e1) + built-in rebase: reinstate `checkout -q` behavior where appropriate + rebase: prepare reset_head() for more flags + rebase: consolidate clean-up code before leaving reset_head() Code clean-up with correction to make the reimplemented "git rebase" a more faithful rewrite of the original, which also regains performance. * js/config-sequence (2018-11-16) 1 commit (merged to 'next' on 2018-11-17 at fefca0bbe8) + config: report a bug if git_dir exists without commondir A sanity check for start-up sequence has been added in the config API codepath. * js/fuzz-cxxflags (2018-11-16) 1 commit (merged to 'next' on 2018-11-17 at 5e589a5237) + Makefile: use FUZZ_CXXFLAGS for linking fuzzers The build procedure to link for fuzzing test has been made customizable with a new Makefile variable. * js/mailmap (2018-11-12) 1 commit (merged to 'next' on 2018-11-17 at 673bfc4cfa) + Update .mailmap Update the mailmap to unify multiple entries for the authors with commits since v2.10. * js/mingw-create-hard-link (2018-11-14) 1 commit (merged to 'next' on 2018-11-17 at 27f866db16) + mingw: use `CreateHardLink()` directly Windows update. * js/mingw-msdn-url (2018-11-16) 1 commit (merged to 'next' on 2018-11-17 at a6a9afddbf) + mingw: replace an obsolete link with the superseding one The URL to an MSDN page in a comment has been updated. * js/mingw-res-rebuild (2018-11-07) 1 commit (merged to 'next' on 2018-11-13 at fb736827d1) + Windows: force-recompile git.res for differing architectures Windows build update. * js/rebase-am-options (2018-11-16) 2 commits (merged to 'next' on 2018-11-17 at f956d9b948) + rebase: validate -C and --whitespace= parameters early + rebase: really just passthru the `git am` options The way "git rebase" parses and forwards the command line options meant for underlying "git am" has been revamped, which fixed for options with parameters that were not passed correctly. * js/rebase-autostash-detach-fix (2018-11-08) 2 commits (merged to 'next' on 2018-11-17 at 15957b4a5a) + built-in rebase --autostash: leave the current branch alone if possible + built-in rebase: demonstrate regression with --autostash "git rebase --autostash" did not correctly re-attach the HEAD at times. * js/rebase-r-and-merge-head (2018-11-13) 5 commits (merged to 'next' on 2018-11-17 at 6bb27df7b1) + status: rebase and merge can be in progress at the same time + built-in rebase --skip/--abort: clean up stale .git/ files + rebase -i: include MERGE_HEAD into files to clean up + rebase -r: do not write MERGE_HEAD unless needed + rebase -r: demonstrate bug with conflicting merges Bugfix for the recently graduated "git rebase --rebase-merges". * js/test-git-installed (2018-11-16) 5 commits (merged to 'next' on 2018-11-18 at 61474ba19e) + tests: explicitly use `git.exe` on Windows + tests: do not require Git to be built when testing an installed Git + t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set + tests: respect GIT_TEST_INSTALLED when initializing repositories + tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/ Update the "test installed Git" mode of our test suite to work better. * lj/mingw-pthread-cond (2018-11-14) 1 commit (merged to 'next' on 2018-11-17 at 46abe4100d) + win32: replace pthread_cond_*() with much simpler code Code simplification. * mg/gpg-fingerprint-test (2018-11-05) 2 commits (merged to 'next' on 2018-11-13 at 71f11020c4) + t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key + t/t7510-signed-commit.sh: Add %GP to custom format checks Add a few tests for a topic already in 'master'. * nd/command-list-gen-fix (2018-11-12) 1 commit (merged to 'next' on 2018-11-17 at a6ff6baa0b) + build: fix broken command-list.h generation with core.autocrlf Build tweak. * nd/doc-extensions (2018-11-16) 1 commit (merged to 'next' on 2018-11-17 at 09306064d5) + doc: move extensions.worktreeConfig to the right place Doc update. * nd/format-patch-cover-letter-stat-width (2018-11-13) 1 commit (merged to 'next' on 2018-11-18 at 65a464977d) + format-patch: respect --stat in cover letter's diffstat "git format-patch --stat=" can be used to specify the width used by the diffstat (shown in the cover letter). * nd/pthreads (2018-11-05) 14 commits (merged to 'next' on 2018-11-13 at bb6914b3f8) + Clean up pthread_create() error handling + read-cache.c: initialize copy_len to shut up gcc 8 + read-cache.c: reduce branching based on HAVE_THREADS + read-cache.c: remove #ifdef NO_PTHREADS + pack-objects: remove #ifdef NO_PTHREADS + preload-index.c: remove #ifdef NO_PTHREADS + grep: clean up num_threads handling + grep: remove #ifdef NO_PTHREADS + attr.c: remove #ifdef NO_PTHREADS + name-hash.c: remove #ifdef NO_PTHREADS + index-pack: remove #ifdef NO_PTHREADS + send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c + run-command.h: include thread-utils.h instead of pthread.h + thread-utils: macros to unconditionally compile pthreads API The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS". * ra/rev-parse-exclude-glob (2018-11-13) 2 commits (merged to 'next' on 2018-11-17 at 396dd7a2c2) + refs: fix some exclude patterns being ignored + refs: show --exclude failure with --branches/tags/remotes=glob "rev-parse --exclude= --branches=" etc. did not quite work, which has been corrected. * sb/cocci-pending (2018-11-14) 1 commit (merged to 'next' on 2018-11-18 at dd271722d3) + coccicheck: introduce 'pending' semantic patches A coding convention around the Coccinelle semantic patches to have two classes to ease code migration process has been proposed and its support has been added to the Makefile. * sg/ref-filter-wo-repository (2018-11-16) 1 commit (merged to 'next' on 2018-11-17 at c0bec63990) + ref-filter: don't look for objects when outside of a repository "git ls-remote --sort=" can feed an object that is not yet available into the comparison machinery and segfault, which has been corrected to check such a request upfront and reject it. * tb/print-size-t-with-uintmax-format (2018-11-12) 1 commit (merged to 'next' on 2018-11-18 at 752e51c7ed) + Upcast size_t variables to uintmax_t when printing Code preparation to replace ulong vars with size_t vars where appropriate. * tb/xcurl-off-t (2018-11-12) 1 commit (merged to 'next' on 2018-11-18 at ac2a4bc14a) + remote-curl.c: xcurl_off_t is not portable (on 32 bit platfoms) The xcurl_off_t() helper function is used to cast size_t to curl_off_t, but some compilers gave warnings against the code to ensure the casting is done without wraparound, when size_t is narrower than curl_off_t. This warning has been squelched. -------------------------------------------------- [New Topics] * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits - merge: add scissors line on merge conflict - t7600: clean up 'merge --squash c3 with c7' test The list of conflicted paths shown in the editor while concluding a conflicted merge was shown above the scissors line when the clean-up mode is set to "scissors", even though it was commented out just like the list of updated paths and other information to help the user explain the merge better. Will merge to 'next'. * aw/pretty-trailers (2018-11-19) 5 commits - pretty: add support for separator option in %(trailers) - strbuf: separate callback for strbuf_expand:ing literals - pretty: add support for "valueonly" option in %(trailers) - pretty: allow showing specific trailers - pretty: single return path in %(trailers) handling The %(trailers) formatter in "git log --format=..." now allows to optionally pick trailers selectively by keyword, show only values, etc. * nd/attr-pathspec-in-tree-walk (2018-11-19) 5 commits - tree-walk: support :(attr) matching - dir.c: move, rename and export match_attrs() - pathspec.h: clean up "extern" in function declarations - tree-walk.c: make tree_entry_interesting() take an index - tree.c: make read_tree*() take 'struct repository *' The traversal over tree objects has learned to honor ":(attr:label)" pathspec match, which has been implemented only for enumerating paths on the filesystem. * ab/commit-graph-progress-fix (2018-11-20) 1 commit - commit-graph: split up close_reachable() progress output * sg/test-BUG (2018-11-20) 1 commit - tests: send "bug in the test script" errors to the script's stderr test framework has been updated to make a bug in the test script (as opposed to bugs in Git that are discovered by running the tests) stand out more prominently. Will merge to 'next'. * sg/test-cmp-rev (2018-11-20) 1 commit - test-lib-functions: make 'test_cmp_rev' more informative on failure Test framework update. Will merge to 'next'. * ss/msvc-strcasecmp (2018-11-20) 1 commit - msvc: directly use MS version (_stricmp) of strcasecmp MSVC update. Will merge to 'next'. * cc/delta-islands (2018-11-21) 3 commits (merged to 'next' on 2018-11-21 at 3bac399f83) + pack-objects: fix off-by-one in delta-island tree-depth computation + pack-objects: zero-initialize tree_depth/layer arrays + pack-objects: fix tree_depth and layer invariants A few issues in the implementation of "delta-islands" feature has been corrected. Will merge to 'master'. * jn/eoie-ieot (2018-11-21) 3 commits (merged to 'next' on 2018-11-21 at 9eb98a38f0) + index: make index.threads=true enable ieot and eoie + ieot: default to not writing IEOT section + eoie: default to not writing EOIE section (this branch is used by jn/unknown-index-extensions.) As the warning message shown by existing versions of Git for unknown index extensions is a bit too alarming, two new extensions are held back and not written by default for the upcoming release. Will merge to 'master'. * jn/unknown-index-extensions (2018-11-21) 2 commits - index: offer advice for unknown index extensions - index: do not warn about unrecognized extensions (this branch uses jn/eoie-ieot.) A bit too alarming warning given when unknown index extensions exist is getting revamped. Expecting a reroll. * js/builtin-rebase-perf-fix-err-fix (2018-11-21) 1 commit (merged to 'next' on 2018-11-21 at 9c351cfc4a) + rebase: warn about the correct tree's OID The object name of the tree reported in a recently added error message was wrong, which has been corrected. Will merge to 'master'. * js/rebase-am-options-fix (2018-11-21) 1 commit (merged to 'next' on 2018-11-21 at 4da85e17c2) + legacy-rebase: backport -C and --whitespace=