From: Junio C Hamano Date: Thu, 25 Jun 2020 22:23:05 +0000 (-0700) Subject: What's cooking (2020/06 #05) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e141547437a4b0cd7a84fab726bcac1e34e2805b;p=thirdparty%2Fgit.git What's cooking (2020/06 #05) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index daa2c4c1c4..a394c2cd45 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jun 2020, #04; Mon, 22) -X-master-at: c9c318d6bf26bcecdca5b6f31683b9d5887a83ee -X-next-at: 4b34aa94c75220f6f4cd334b08a3fb053128a32d +Subject: What's cooking in git.git (Jun 2020, #05; Thu, 25) +X-master-at: f402ea68166bd77f09b176c96005ac7f8886e14b +X-next-at: b9a2d1a0207fb9ded3fa524f54db3bc322a12cc4 -What's cooking in git.git (Jun 2020, #04; Mon, 22) +What's cooking in git.git (Jun 2020, #05; Thu, 25) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -12,18 +12,8 @@ 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. -A few topiocs have graduated to 'master'. As I expect that the next -week would be slower than usual due to being summer (and folks in US -having holidays), I am hoping that I can merge down a handful more -topics from 'next', perhaps with shorter gestation period than -usual, by the end of this week. - -The 'pu' (proposed updates) branch has been renamed to 'seen' to use -a more meaningful name (after all, the purpose of it is not to -contain all proposals, but to merely serve as a place to park what -the maintainer happened to have seen) and more importantly, to make -room for topics from those contributors whose two-letter name -abbreviation needs to be 'pu' under 'pu/$topicName'. +A handful of topics have graduated to 'master' and a bunch of topics +have been merged to 'next'. You can find the changes described here in the integration branches of the repositories listed at @@ -33,203 +23,237 @@ repositories listed at -------------------------------------------------- [Graduated to "master"] -* cc/upload-pack-data-2 (2020-06-04) 13 commits - (merged to 'next' on 2020-06-12 at ee63b70dc2) - + upload-pack: move pack_objects_hook to upload_pack_data - + upload-pack: move allow_sideband_all to upload_pack_data - + upload-pack: move allow_ref_in_want to upload_pack_data - + upload-pack: move allow_filter to upload_pack_data - + upload-pack: move keepalive to upload_pack_data - + upload-pack: pass upload_pack_data to upload_pack_config() - + upload-pack: change multi_ack to an enum - + upload-pack: move multi_ack to upload_pack_data - + upload-pack: move filter_capability_requested to upload_pack_data - + upload-pack: move use_sideband to upload_pack_data - + upload-pack: move static vars to upload_pack_data - + upload-pack: annotate upload_pack_data fields - + upload-pack: actually use some upload_pack_data bitfields - (this branch is used by cc/upload-pack-data-3 and jt/cdn-offload.) +* cc/upload-pack-data-3 (2020-06-11) 14 commits + (merged to 'next' on 2020-06-17 at 393eff577a) + + upload-pack: refactor common code into do_got_oid() + + upload-pack: move oldest_have to upload_pack_data + + upload-pack: pass upload_pack_data to got_oid() + + upload-pack: pass upload_pack_data to ok_to_give_up() + + upload-pack: pass upload_pack_data to send_acks() + + upload-pack: pass upload_pack_data to process_haves() + + upload-pack: change allow_unadvertised_object_request to an enum + + upload-pack: move allow_unadvertised_object_request to upload_pack_data + + upload-pack: move extra_edge_obj to upload_pack_data + + upload-pack: move shallow_nr to upload_pack_data + + upload-pack: pass upload_pack_data to send_unshallow() + + upload-pack: pass upload_pack_data to deepen_by_rev_list() + + upload-pack: pass upload_pack_data to deepen() + + upload-pack: pass upload_pack_data to send_shallow_list() - Further code clean-up. + Code clean-up in the codepath that serves "git fetch" continues. -* en/sparse-with-submodule-doc (2020-06-12) 1 commit - (merged to 'next' on 2020-06-17 at 3521be3834) - + git-sparse-checkout: clarify interactions with submodules +* ct/diff-with-merge-base-clarification (2020-06-12) 3 commits + (merged to 'next' on 2020-06-17 at e0b54a001c) + + Documentation: usage for diff combined commits + + git diff: improve range handling + + t/t3430: avoid undefined git diff behavior - The effect of sparse checkout settings on submodules is documented. + "git diff" used to take arguments in random and nonsense range + notation, e.g. "git diff A..B C", "git diff A..B C...D", etc., + which has been cleaned up. -* es/worktree-duplicate-paths (2020-06-10) 7 commits - (merged to 'next' on 2020-06-12 at 5f7c822a9d) - + worktree: make "move" refuse to move atop missing registered worktree - + worktree: generalize candidate worktree path validation - + worktree: prune linked worktree referencing main worktree path - + worktree: prune duplicate entries referencing same worktree path - + worktree: make high-level pruning re-usable - + worktree: give "should be pruned?" function more meaningful name - + worktree: factor out repeated string literal - (this branch is used by es/get-worktrees-unsort.) +* dl/branch-cleanup (2020-06-17) 3 commits + (merged to 'next' on 2020-06-18 at 76e151342c) + + branch: don't mix --edit-description + + t3200: test for specific errors + + t3200: rename "expected" to "expect" - The same worktree directory must be registered only once, but - "git worktree move" allowed this invariant to be violated, which - has been corrected. + Code clean-up around "git branch" with a minor bugfix. -* jt/redact-all-cookies (2020-06-05) 1 commit - (merged to 'next' on 2020-06-12 at 912c337d63) - + http: redact all cookies, teach GIT_TRACE_REDACT=0 +* ds/merge-base-is-ancestor-optim (2020-06-17) 2 commits + (merged to 'next' on 2020-06-18 at 86b34a3688) + + commit-reach: use fast logic in repo_in_merge_base + + commit-reach: create repo_is_descendant_of() + (this branch is used by cb/is-descendant-of.) - The interface to redact sensitive information in the trace output - has been simplified. + "git merge-base --is-ancestor" is taught to take advantage of the + commit graph. --------------------------------------------------- -[New Topics] -* en/sparse-status (2020-06-22) 3 commits - - git-prompt: include sparsity state as well - - git-prompt: document how in-progress operations affect the prompt - - wt-status: show sparse checkout status as well +* en/clean-cleanups (2020-06-12) 4 commits + (merged to 'next' on 2020-06-17 at 2c4ec990a6) + + clean: optimize and document cases where we recurse into subdirectories + + clean: consolidate handling of ignored parameters + + dir, clean: avoid disallowed behavior + + dir: fix a few confusing comments - "git status" learned to report the status of sparse checkout. + Code clean-up of "git clean" resulted in a fix of recent + performance regression. - Will merge to 'next'. +* jk/complete-git-switch (2020-05-28) 16 commits + (merged to 'next' on 2020-06-17 at 5b31140c0a) + + completion: improve handling of --orphan option of switch/checkout + + completion: improve handling of -c/-C and -b/-B in switch/checkout + + completion: improve handling of --track in switch/checkout + + completion: improve handling of --detach in checkout + + completion: improve completion for git switch with no options + + completion: improve handling of DWIM mode for switch/checkout + + completion: perform DWIM logic directly in __git_complete_refs + + completion: extract function __git_dwim_remote_heads + + completion: replace overloaded track term for __git_complete_refs + + completion: add tests showing subpar switch/checkout --orphan logic + + completion: add tests showing subpar -c/C argument completion + + completion: add tests showing subpar -c/-C startpoint completion + + completion: add tests showing subpar switch/checkout --track logic + + completion: add tests showing subar checkout --detach logic + + completion: add tests showing subpar DWIM logic for switch/checkout + + completion: add test showing subpar git switch completion -* dl/diff-usage-comment-update (2020-06-18) 1 commit - (merged to 'next' on 2020-06-19 at b53a12bb66) - + builtin/diff: update usage comment + The command line completion (in contrib/) learned to complete + options that the "git switch" command takes. - An in-code comment in "git diff" has been updated. - Will merge to 'master'. +* jt/cdn-offload (2020-06-17) 10 commits + (merged to 'next' on 2020-06-18 at e8ba1cc988) + + upload-pack: fix a sparse '0 as NULL pointer' warning + + 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-fetch: refactor into function + + http: refactor finish_http_pack_request() + + http: use --stdin when indexing dumb HTTP pack + The "fetch/clone" protocol has been updated to allow the server to + instruct the clients to grab pre-packaged packfile(s) in addition + to the packed object data coming over the wire. -* ps/ref-transaction-hook (2020-06-19) 1 commit - (merged to 'next' on 2020-06-22 at 3a23dcdbdc) - + refs: implement reference transaction hook - A new hook. +* pb/t4014-unslave (2020-06-19) 1 commit + (merged to 'next' on 2020-06-19 at 4d328a12d9) + + t4014: do not use "slave branch" nomenclature - Will merge to 'master'. + A branch name used in a test has been clarified to match what is + going on. -* sk/diff-files-show-i-t-a-as-new (2020-06-22) 1 commit - (merged to 'next' on 2020-06-22 at 825a823416) - + diff-files: treat "i-t-a" files as "not-in-index" +* ss/submodule-set-branch-in-c (2020-06-02) 1 commit + (merged to 'next' on 2020-06-18 at 8880b35c5a) + + submodule: port subcommand 'set-branch' from shell to C - "git diff-files" has been taught to say paths that are marked as - intent-to-add are new files, not modified from an empty blob. + Rewrite of parts of the scripted "git submodule" Porcelain command + continues; this time it is "git submodule set-branch" subcommand's + turn. + +-------------------------------------------------- +[New Topics] + +* bc/http-push-flagsfix (2020-06-23) 1 commit + (merged to 'next' on 2020-06-25 at 1dabb1f61b) + + http-push: ensure unforced pushes fail when data would be lost + + The code to push changes over "dumb" HTTP had a bad interaction + with the commit reachability code due to incorrect allocation of + object flag bits, which has been corrected. Will merge to 'master'. -* jk/fast-export-anonym (2020-06-22) 4 commits - (merged to 'next' on 2020-06-22 at b517b2f707) - + fast-export: allow dumping the path mapping - + fast-export: refactor path printing to not rely on stdout - + fast-export: anonymize "master" refname - + fast-export: allow dumping the refname mapping +* cb/is-descendant-of (2020-06-23) 1 commit + (merged to 'next' on 2020-06-25 at ca0eaddf5e) + + commit-reach: avoid is_descendant_of() shim - The way refnames are anonymized has been updated and a way to help - debugging using the anonymized output hsa been added. + Code clean-up. Will merge to 'master'. -* pb/t4014-unslave (2020-06-19) 1 commit - (merged to 'next' on 2020-06-19 at 4d328a12d9) - + t4014: do not use "slave branch" nomenclature +* jk/fast-export-anonym-alt (2020-06-25) 11 commits + - fast-export: use local array to store anonymized oid + - fast-export: anonymize "master" refname + - fast-export: allow seeding the anonymized mapping + - fast-export: add a "data" callback parameter to anonymize_str() + - fast-export: move global "idents" anonymize hashmap into function + - fast-export: use a flex array to store anonymized entries + - fast-export: stop storing lengths in anonymized hashmaps + - fast-export: tighten anonymize_mem() interface to handle only strings + - fast-export: store anonymized oids as hex strings + - fast-export: use xmemdupz() for anonymizing oids + - t9351: derive anonymized tree checks from original repo - A branch name used in a test has been clarified to match what is - going on. + "git fast-export --anonymize" learned to take customized mapping to + allow its users to tweak its output more usable for debugging. - Will merge to 'master'. + Will merge to 'next'. -* rs/commit-reach-leakfix (2020-06-19) 1 commit - (merged to 'next' on 2020-06-22 at fcc1e385f0) - + commit-reach: plug minor memory leak after using is_descendant_of() +* js/diff-files-i-t-a-fix-for-difftool (2020-06-25) 2 commits + - difftool -d: ensure that intent-to-add files are handled correctly + - diff-files --raw: show correct post-image of intent-to-add files + (this branch uses sk/diff-files-show-i-t-a-as-new.) - Leakfix. + "git difftool" has trouble dealing with paths added to the index + with the intent-to-add bit. - Will merge to 'master'. + Will merge to 'next'. -* rs/pull-leakfix (2020-06-19) 1 commit - (merged to 'next' on 2020-06-22 at d80a6b9ca3) - + pull: plug minor memory leak after using is_descendant_of() +* js/pu-to-seen (2020-06-25) 3 commits + (merged to 'next' on 2020-06-25 at 06c9e5a885) + + tests: reference `seen` wherever `pu` was referenced + + docs: adjust the technical overview for the rename `pu` -> `seen` + + docs: adjust for the recent rename of `pu` to `seen` - Leakfix. + The documentation and some tests have been adjusted for the recent + renaming of "pu" branch to "seen". Will merge to 'master'. -* rs/retire-strbuf-write-fd (2020-06-19) 2 commits - (merged to 'next' on 2020-06-22 at c175b54f2a) - + strbuf: remove unreferenced strbuf_write_fd method. - + bugreport.c: replace strbuf_write_fd with write_in_full +* mk/pb-pretty-email-without-domain-part-fix (2020-06-23) 1 commit + (merged to 'next' on 2020-06-25 at 81a3aca46b) + + doc: fix author vs. committer copy/paste error - A misdesigned strbuf_write_fd() function has been retired. + Docfix. Will merge to 'master'. -* bc/sha-256-cvs-svn-updates (2020-06-22) 14 commits - - git-cvsexportcommit: port to SHA-256 - - git-cvsimport: port to SHA-256 - - git-cvsserver: port to SHA-256 - - git-svn: set the OID length based on hash algorithm - - perl: make SVN code hash independent - - perl: make Git::IndexInfo work with SHA-256 - - perl: create and switch variables for hash constants - - t/lib-git-svn: make hash size independent - - t9101: make hash independent - - t9104: make hash size independent - - t9100: make test work with SHA-256 - - t9108: make test hash independent - - t9168: make test hash independent - - t9109: make test hash independent - (this branch uses bc/sha-256-part-2.) +* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits + - submodule: use submodule repository when preparing summary + - revision: use repository from rev_info when parsing commits - CVS/SVN interface have been prepared for SHA-256 transition + "git diff/show" on a change that involves a submodule used to read + the information on commits in the submodule from a wrong repository + and gave a wrong information when the commit-graph is involved. - Will merge to 'next'. + Needs tests. -* ds/commit-graph-bloom-updates (2020-06-17) 8 commits - - commit-graph: persist existence of changed-paths - - commit-graph: change test to die on parse, not load - - bloom: enforce a minimum size of 8 bytes - - commit-graph: check all leading directories in changed path Bloom filters - - commit-graph: check chunk sizes after writing - - commit-graph: simplify chunk writes into loop - - commit-graph: unify the signatures of all write_graph_chunk_*() functions - - commit-graph: place bloom_settings in context - (this branch uses sg/commit-graph-cleanups.) +* rs/pack-bits-in-object-better (2020-06-24) 1 commit + (merged to 'next' on 2020-06-25 at b3cb296341) + + revision: reallocate TOPO_WALK object flags - Updates to the changed-paths bloom filter. + By renumbering object flag bits, "struct object" managed to lose + bloated inter-field padding. - Being discussed. - cf. <20200619171922.GA57283@syl.local> + Will merge to 'master'. -* es/get-worktrees-unsort (2020-06-22) 2 commits - - worktree: drop get_worktrees() unused 'flags' argument - - worktree: drop get_worktrees() special-purpose sorting option +* es/worktree-code-cleanup (2020-06-24) 1 commit + - worktree: avoid dead-code in conditional - API cleanup for get_worktrees() + Code cleanup. Will merge to 'next'. -* jl/complete-git-prune (2020-06-22) 1 commit - - bash-completion: add git-prune into bash completion +* ra/send-email-in-reply-to-from-command-line-wins (2020-06-24) 1 commit + - send-email: restore --in-reply-to superseding behavior - Add "git prune" to the completion (in contrib/), which could be - typed by end-users from the command line. + "git send-email --in-reply-to=" did not use the In-Reply-To: + header with the value given from the command line, and let it be + overridden by the value on In-Reply-To: header in the messages + being sent out (if exists). - Will merge to 'next'. + Expecting a reroll/redesign. + Does not behave sensibly for a multi-patch series. -------------------------------------------------- [Stalled] @@ -277,75 +301,168 @@ repositories listed at -------------------------------------------------- [Cooking] -* cc/upload-pack-data-3 (2020-06-11) 14 commits - (merged to 'next' on 2020-06-17 at 393eff577a) - + upload-pack: refactor common code into do_got_oid() - + upload-pack: move oldest_have to upload_pack_data - + upload-pack: pass upload_pack_data to got_oid() - + upload-pack: pass upload_pack_data to ok_to_give_up() - + upload-pack: pass upload_pack_data to send_acks() - + upload-pack: pass upload_pack_data to process_haves() - + upload-pack: change allow_unadvertised_object_request to an enum - + upload-pack: move allow_unadvertised_object_request to upload_pack_data - + upload-pack: move extra_edge_obj to upload_pack_data - + upload-pack: move shallow_nr to upload_pack_data - + upload-pack: pass upload_pack_data to send_unshallow() - + upload-pack: pass upload_pack_data to deepen_by_rev_list() - + upload-pack: pass upload_pack_data to deepen() - + upload-pack: pass upload_pack_data to send_shallow_list() +* en/sparse-status (2020-06-22) 3 commits + (merged to 'next' on 2020-06-25 at 404403a075) + + git-prompt: include sparsity state as well + + git-prompt: document how in-progress operations affect the prompt + + wt-status: show sparse checkout status as well - Code clean-up in the codepath that serves "git fetch" continues. + "git status" learned to report the status of sparse checkout. Will merge to 'master'. -* ct/diff-with-merge-base-clarification (2020-06-12) 3 commits - (merged to 'next' on 2020-06-17 at e0b54a001c) - + Documentation: usage for diff combined commits - + git diff: improve range handling - + t/t3430: avoid undefined git diff behavior +* dl/diff-usage-comment-update (2020-06-23) 2 commits + (merged to 'next' on 2020-06-23 at 48d685cd45) + + builtin/diff: fix botched update of usage comment + (merged to 'next' on 2020-06-19 at b53a12bb66) + + builtin/diff: update usage comment - "git diff" used to take arguments in random and nonsense range - notation, e.g. "git diff A..B C", "git diff A..B C...D", etc., - which has been cleaned up. + An in-code comment in "git diff" has been updated. Will merge to 'master'. -* js/default-branch-name (2020-06-19) 8 commits - - Document how the default branch name can be overridden - - fmt-merge-msg: learn about the possibly-configured default branch name - - clone: learn about the possibly-configured default branch name - - submodule: use the (possibly overridden) default branch name - - testsvn: respect `core.defaultBranchName` - - send-pack/transport-helper: respect `core.defaultBranchName` - - remote: respect `core.defaultBranchName` - - init: allow overriding the default branch name for new repositories +* ps/ref-transaction-hook (2020-06-19) 1 commit + (merged to 'next' on 2020-06-22 at 3a23dcdbdc) + + refs: implement reference transaction hook - The name of the primary branch in existing repositories, and the - default name used for the first branch in newly created - repositories, is made configurable, so that we can eventually wean - ourselves off of the hardcoded 'master'. + A new hook. - Expecting a reroll. + Will merge to 'master'. -* jt/cdn-offload (2020-06-17) 10 commits - (merged to 'next' on 2020-06-18 at e8ba1cc988) - + upload-pack: fix a sparse '0 as NULL pointer' warning - + 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-fetch: refactor into function - + http: refactor finish_http_pack_request() - + http: use --stdin when indexing dumb HTTP pack +* sk/diff-files-show-i-t-a-as-new (2020-06-22) 1 commit + (merged to 'next' on 2020-06-22 at 825a823416) + + diff-files: treat "i-t-a" files as "not-in-index" + (this branch is used by js/diff-files-i-t-a-fix-for-difftool.) - The "fetch/clone" protocol has been updated to allow the server to - instruct the clients to grab pre-packaged packfile(s) in addition - to the packed object data coming over the wire. + "git diff-files" has been taught to say paths that are marked as + intent-to-add are new files, not modified from an empty blob. + + Will merge to 'master'. + + +* jk/fast-export-anonym (2020-06-22) 4 commits + (merged to 'next' on 2020-06-22 at b517b2f707) + + fast-export: allow dumping the path mapping + + fast-export: refactor path printing to not rely on stdout + + fast-export: anonymize "master" refname + + fast-export: allow dumping the refname mapping + + The way refnames are anonymized has been updated and a way to help + debugging using the anonymized output hsa been added. + + Will merge to 'master'. + + +* rs/commit-reach-leakfix (2020-06-19) 1 commit + (merged to 'next' on 2020-06-22 at fcc1e385f0) + + commit-reach: plug minor memory leak after using is_descendant_of() + + Leakfix. + + Will merge to 'master'. + + +* rs/pull-leakfix (2020-06-19) 1 commit + (merged to 'next' on 2020-06-22 at d80a6b9ca3) + + pull: plug minor memory leak after using is_descendant_of() + + Leakfix. + + Will merge to 'master'. + + +* rs/retire-strbuf-write-fd (2020-06-19) 2 commits + (merged to 'next' on 2020-06-22 at c175b54f2a) + + strbuf: remove unreferenced strbuf_write_fd method. + + bugreport.c: replace strbuf_write_fd with write_in_full + + A misdesigned strbuf_write_fd() function has been retired. + + Will merge to 'master'. + + +* bc/sha-256-cvs-svn-updates (2020-06-22) 14 commits + (merged to 'next' on 2020-06-25 at e0d1c87fcf) + + git-cvsexportcommit: port to SHA-256 + + git-cvsimport: port to SHA-256 + + git-cvsserver: port to SHA-256 + + git-svn: set the OID length based on hash algorithm + + perl: make SVN code hash independent + + perl: make Git::IndexInfo work with SHA-256 + + perl: create and switch variables for hash constants + + t/lib-git-svn: make hash size independent + + t9101: make hash independent + + t9104: make hash size independent + + t9100: make test work with SHA-256 + + t9108: make test hash independent + + t9168: make test hash independent + + t9109: make test hash independent + (this branch uses bc/sha-256-part-2.) + + CVS/SVN interface have been prepared for SHA-256 transition + + Will merge to 'master'. + + +* ds/commit-graph-bloom-updates (2020-06-23) 11 commits + - bloom: enforce a minimum size of 8 bytes + - commit-graph: check all leading directories in changed path Bloom filters + - revision: empty pathspecs should not use Bloom filters + - revision.c: fix whitespace + - commit-graph: check chunk sizes after writing + - commit-graph: simplify chunk writes into loop + - commit-graph: unify the signatures of all write_graph_chunk_*() functions + - commit-graph: persist existence of changed-paths + - bloom: get_bloom_filter() cleanups + - commit-graph: change test to die on parse, not load + - commit-graph: place bloom_settings in context + (this branch uses sg/commit-graph-cleanups.) + + Updates to the changed-paths bloom filter. + + Expecting a reroll. Saw a lot of good review exchanges. + cf. <4b08360d-04ab-b614-196b-76124f1d54ef@gmail.com> + + +* es/get-worktrees-unsort (2020-06-22) 2 commits + (merged to 'next' on 2020-06-25 at 732d93a36d) + + worktree: drop get_worktrees() unused 'flags' argument + + worktree: drop get_worktrees() special-purpose sorting option + + API cleanup for get_worktrees() + + Will merge to 'master'. + + +* jl/complete-git-prune (2020-06-22) 1 commit + (merged to 'next' on 2020-06-25 at 64f30b8b41) + + bash-completion: add git-prune into bash completion + + Add "git prune" to the completion (in contrib/), which could be + typed by end-users from the command line. + + Will merge to 'master'. + + +* js/default-branch-name (2020-06-24) 9 commits + (merged to 'next' on 2020-06-25 at 8f962f9219) + + testsvn: respect `init.defaultBranch` + + remote: use the configured default branch name when appropriate + + clone: use configured default branch name when appropriate + + init: allow setting the default for the initial branch name via the config + + init: allow specifying the initial branch name for the new repository + + docs: add missing diamond brackets + + submodule: fall back to remote's HEAD for missing remote..branch + + send-pack/transport-helper: avoid mentioning a particular branch + + fmt-merge-msg: stop treating `master` specially + + The name of the primary branch in existing repositories, and the + default name used for the first branch in newly created + repositories, is made configurable, so that we can eventually wean + ourselves off of the hardcoded 'master'. Will merge to 'master'. @@ -362,64 +479,32 @@ repositories listed at CMake support to build with MSVC for Windows bypassing the Makefile. + Expecting a reroll. Almost there. * ak/commit-graph-to-slab (2020-06-17) 4 commits - - commit-graph: minimize commit_graph_data_slab access - - commit: move members graph_pos, generation to a slab - - commit-graph: introduce commit_graph_data_slab - - object: drop parsed_object_pool->commit_count + (merged to 'next' on 2020-06-25 at 9a10ae18d3) + + commit-graph: minimize commit_graph_data_slab access + + commit: move members graph_pos, generation to a slab + + commit-graph: introduce commit_graph_data_slab + + object: drop parsed_object_pool->commit_count A few fields in "struct commit" that do not have to always be present have been moved to commit slabs. - -* en/clean-cleanups (2020-06-12) 4 commits - (merged to 'next' on 2020-06-17 at 2c4ec990a6) - + clean: optimize and document cases where we recurse into subdirectories - + clean: consolidate handling of ignored parameters - + dir, clean: avoid disallowed behavior - + dir: fix a few confusing comments - - "git clean" code clean-up that resulted in a fix of recent - performance regression. - - Will merge to 'master'. - - -* dl/branch-cleanup (2020-06-17) 3 commits - (merged to 'next' on 2020-06-18 at 76e151342c) - + branch: don't mix --edit-description - + t3200: test for specific errors - + t3200: rename "expected" to "expect" - - Code clean-up around "git branch" with a minor bugfix. - - Will merge to 'master'. - - -* ds/merge-base-is-ancestor-optim (2020-06-17) 2 commits - (merged to 'next' on 2020-06-18 at 86b34a3688) - + commit-reach: use fast logic in repo_in_merge_base - + commit-reach: create repo_is_descendant_of() - - "git merge-base --is-ancestor" is taught to take advantage of the - commit graph. - Will merge to 'master'. -* dl/test-must-fail-fixes-5 (2020-06-18) 4 commits - - lib-submodule-update: use callbacks in test_submodule_switch_common() +* dl/test-must-fail-fixes-5 (2020-06-24) 4 commits + - lib-submodule-update: pass 'test_must_fail' as an argument - lib-submodule-update: prepend "git" to $command - lib-submodule-update: consolidate --recurse-submodules - lib-submodule-update: add space after function name The effort to avoid using test_must_fail on non-git command continues. - Getting very close. - cf. <20200618181533.GA633383@coredump.intra.peff.net> + Will merge to 'next'. * sg/commit-graph-cleanups (2020-06-08) 10 commits @@ -438,6 +523,8 @@ repositories listed at The changed-path Bloom filter is improved using ideas from an independent implementation. + Will merge to 'next'. + * xl/upgrade-repo-format (2020-06-05) 4 commits (merged to 'next' on 2020-06-19 at 02bf7a9d8c) @@ -456,42 +543,6 @@ repositories listed at Will merge to 'master'. -* jk/complete-git-switch (2020-05-28) 16 commits - (merged to 'next' on 2020-06-17 at 5b31140c0a) - + completion: improve handling of --orphan option of switch/checkout - + completion: improve handling of -c/-C and -b/-B in switch/checkout - + completion: improve handling of --track in switch/checkout - + completion: improve handling of --detach in checkout - + completion: improve completion for git switch with no options - + completion: improve handling of DWIM mode for switch/checkout - + completion: perform DWIM logic directly in __git_complete_refs - + completion: extract function __git_dwim_remote_heads - + completion: replace overloaded track term for __git_complete_refs - + completion: add tests showing subpar switch/checkout --orphan logic - + completion: add tests showing subpar -c/C argument completion - + completion: add tests showing subpar -c/-C startpoint completion - + completion: add tests showing subpar switch/checkout --track logic - + completion: add tests showing subar checkout --detach logic - + completion: add tests showing subpar DWIM logic for switch/checkout - + completion: add test showing subpar git switch completion - - The command line completion (in contrib/) learned to complete - options that the "git switch" command takes. - - Will merge to 'master'. - - -* ss/submodule-set-branch-in-c (2020-06-02) 1 commit - (merged to 'next' on 2020-06-18 at 8880b35c5a) - + submodule: port subcommand 'set-branch' from shell to C - - Rewrite of parts of the scripted "git submodule" Porcelain command - continues; this time it is "git submodule set-branch" subcommand's - turn. - - Will merge to 'master'. - - * es/config-hooks (2020-05-21) 4 commits - hook: add --porcelain to list command - hook: add list command @@ -500,7 +551,7 @@ repositories listed at The "hooks defined in config" topic. - Ready??? + What's the status of this one? Abandoned? * pw/rebase-i-more-options (2020-05-27) 5 commits @@ -512,7 +563,7 @@ repositories listed at "git rebase -i" learns a bit more options. - Not quite. + Expecting a reroll. cf.