diff --git a/whats-cooking.txt b/whats-cooking.txt index 021ed580f01c219f3e802033dd8400b55f24917b..e2a51605fec3c56dc25653177b6b35e3ad835d58 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 (Aug 2020, #06; Mon, 24) -X-master-at: e9b77c84a0a0df029f2a3a8114e9f22186e7da24 -X-next-at: 40977abb4059c11004726852a79df64f4553944d +Subject: What's cooking in git.git (Aug 2020, #07; Thu, 27) +X-master-at: 20de7e7e4f4e9ae52e6cc7cfaa6469f186ddb0fa +X-next-at: e36021eeeff56bc9a7afbe027201c2c7f8603545 -What's cooking in git.git (Aug 2020, #06; Mon, 24) +What's cooking in git.git (Aug 2020, #07; Thu, 27) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -20,169 +20,208 @@ repositories listed at -------------------------------------------------- [Graduated to 'master'] -* dl/subtree-docs (2020-08-18) 2 commits - (merged to 'next' on 2020-08-19 at e1a8ea9d46) - + contrib/subtree: document 'push' does not take '--squash' - + contrib/subtree: fix "unsure" for --message in the document +* en/mem-pool (2020-08-18) 3 commits + (merged to 'next' on 2020-08-19 at eff9ad46f0) + + mem-pool: use consistent pool variable name + + mem-pool: use more standard initialization and finalization + + mem-pool: add convenience functions for strdup and strndup - Doc updates for subtree (in contrib/) + API update. -* ds/midx-repack-to-batch-size (2020-08-11) 1 commit - (merged to 'next' on 2020-08-17 at eee94634aa) - + multi-pack-index: repack batches below --batch-size +* hn/refs-fetch-head-is-special (2020-08-19) 4 commits + (merged to 'next' on 2020-08-21 at def233ab43) + + refs: read FETCH_HEAD and MERGE_HEAD generically + + refs: move gitdir into base ref_store + + refs: fix comment about submodule ref_stores + + refs: split off reading loose ref data in separate function + (this branch is used by hn/refs-pseudorefs.) - The "--batch-size" option of "git multi-pack-index repack" command - is now used to specify that very small packfiles are collected into - one until the total size roughly exceeds it. + The FETCH_HEAD is now always read from the filesystem regardless of + the ref backend in use, as its format is much richer than the + normal refs, and written directly by "git fetch" as a plain file.. -* en/dir-clear (2020-08-18) 2 commits - (merged to 'next' on 2020-08-19 at 18c5b69293) - + dir: fix problematic API to avoid memory leaks - + dir: make clear_directory() free all relevant memory +* jk/leakfix (2020-08-17) 7 commits + (merged to 'next' on 2020-08-21 at a8b25a2657) + + submodule--helper: fix leak of core.worktree value + + config: fix leak in git_config_get_expiry_in_days() + + config: drop git_config_get_string_const() + + config: fix leaks from git_config_get_string_const() + + checkout: fix leak of non-existent branch names + + submodule--helper: use strbuf_release() to free strbufs + + clear_pattern_list(): clear embedded hashmaps - Leakfix with code clean-up. + Code clean-up. -* en/dir-nonbare-embedded (2020-08-12) 2 commits - (merged to 'next' on 2020-08-17 at ab180b7fcb) - + dir: avoid prematurely marking nonbare repositories as matches - + t3000: fix some test description typos +* rz/complete-more-options (2020-08-19) 2 commits + (merged to 'next' on 2020-08-21 at ba8f4c8cb1) + + completion: add GIT_COMPLETION_SHOW_ALL env var + + parse-options: add --git-completion-helper-all - "ls-files -o" mishandled the top-level directory of another git - working tree that hangs in the current git working tree. + Command line completion (in contrib/) usually omits redundant, + deprecated and/or dangerous options from its output; it learned to + optionally include all of them. +-------------------------------------------------- +[New Topics] -* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit - (merged to 'next' on 2020-08-17 at 80498c8659) - + init: disallow --separate-git-dir with bare repository +* jc/remove-pack-redundant (2020-08-25) 1 commit + - pack-redundant: gauge the usage before proposing its removal - The purpose of "git init --separate-git-dir" is to initialize a - new project with the repository separate from the working tree, - or, in the case of an existing project, to move the repository - (the .git/ directory) out of the working tree. It does not make - sense to use --separate-git-dir with a bare repository for which - there is no working tree, so disallow its use with bare - repositories. + The first step to remove "git pack-redundant" by soliciting + objections. -* jc/no-update-fetch-head (2020-08-18) 1 commit - (merged to 'next' on 2020-08-19 at 68e1374ed6) - + fetch: optionally allow disabling FETCH_HEAD update - (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.) +* ps/ref-transaction-hook (2020-08-25) 1 commit + (merged to 'next' on 2020-08-27 at 49b3fb8349) + + refs: remove lookup cache for reference-transaction hook - "git fetch" learned --no-write-fetch-head option to avoid writing - the FETCH_HEAD file. + Code simplification by removing ineffective optimization. + Will merge to 'master'. -* jk/unleak-fixes (2020-08-13) 2 commits - (merged to 'next' on 2020-08-17 at f9bd296b25) - + ls-remote: simplify UNLEAK() usage - + stop calling UNLEAK() before die() - Fix some incorrect UNLEAK() annotations. +* jc/undash-in-tree-git-callers (2020-08-27) 3 commits + (merged to 'next' on 2020-08-27 at 671fa2f87e) + + credential-cache: use child_process.args + + cvsexportcommit: do not run git programs in dashed form + + transport-helper: do not run git-remote-ext etc. in dashed form + (this branch is used by jc/war-on-dashed-git.) + A handful of places in in-tree code still relied on being able to + execute the git subcommands, especially built-ins, in "git-foo" + form, which have been corrected. -* ma/doc-sha-256-is-experimental (2020-08-17) 1 commit - (merged to 'next' on 2020-08-19 at 9ccf6c399c) - + Documentation: mark `--object-format=sha256` as experimental + Will merge to 'master'. - The recent addition of SHA-256 support is marked as experimental in - the documentation. +* jc/war-on-dashed-git (2020-08-27) 1 commit + - git: catch an attempt to run "git-foo" + (this branch uses jc/undash-in-tree-git-callers.) -* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit - (merged to 'next' on 2020-08-19 at 58866e5299) - + checkout_entry(): remove unreachable error() call + The first step to remove on-disk binaries for built-in subcommands + by soliciting objections. - Code clean-up. + On hold for now. -* rs/more-buffered-io (2020-08-17) 3 commits - (merged to 'next' on 2020-08-19 at 6d23a23bb2) - + upload-pack: use buffered I/O to talk to rev-list - + midx: use buffered I/O to talk to pack-objects - + connected: use buffered I/O to talk to rev-list +* jk/rev-input-given-fix (2020-08-26) 1 commit + (merged to 'next' on 2020-08-27 at da291a327c) + + revision: set rev_input_given in handle_revision_arg() - Use more buffered I/O where we used to call many small write(2)s. + Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and + running "git log --ignore-missing $ZERO_OID" fell back to start + digging from HEAD; it has been corrected to become a no-op, like + "git log --tags=no-tag-matches-this-pattern" does. + Will merge to 'master'. -* rs/patch-id-with-incomplete-line (2020-08-18) 1 commit - (merged to 'next' on 2020-08-19 at 72961d48d0) - + patch-id: ignore newline at end of file in diff_flush_patch_id() - The patch-id computation did not ignore the "incomplete last line" - marker like whitespaces. +* tb/repack-clearing-midx (2020-08-26) 1 commit + (merged to 'next' on 2020-08-27 at a465875cbb) + + builtin/repack.c: invalidate MIDX only when necessary --------------------------------------------------- -[New Topics] + When a packfile is removed by "git repack", multi-pack-index gets + cleared; the code was taught to do so less aggressively by first + checking if the midx actually refers to a pack that no longer + exists. -* jk/refspecs-cleanup (2020-08-17) 2 commits - (merged to 'next' on 2020-08-24 at 807a080ebf) - + refspec: make sure stack refspec_item variables are zeroed - + refspec: fix documentation referring to refspec_item - (this branch is used by jk/refspecs-negative.) + Will merge to 'master'. - Preliminary code clean-up before introducing "negative refspec". + +* jc/run-command-use-embedded-args (2020-08-26) 1 commit + (merged to 'next' on 2020-08-27 at c2b688e8e9) + + run_command: teach API users to use embedded 'args' more + + Various callers of run_command API has been modernized. Will merge to 'master'. -* rs/checkout-no-overlay-pathspec-fix (2020-08-22) 1 commit - - checkout, restore: make pathspec recursive +* es/worktree-repair (2020-08-27) 5 commits + - init: make --separate-git-dir work from within linked worktree + - init: teach --separate-git-dir to repair linked worktrees + - worktree: teach "repair" to fix outgoing links to worktrees + - worktree: teach "repair" to fix worktree back-links to main worktree + - worktree: add skeleton "repair" command - "git restore/checkout --no-overlay" with wildcarded pathspec - mistakenly removed matching paths in subdirectories, which has been - corrected. + "git worktree repair" command to correct on-disk pointers between + the repository and its secondary working trees. - Will merge to 'next'. + Expecting a reroll. -* al/bisect-first-parent (2020-08-22) 1 commit - (merged to 'next' on 2020-08-24 at f95fbf45a6) - + bisect: add first-parent option to documentation +* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit + - worktree: fix leak in check_clean_worktree() - Finishing touches. + Leakfix. - Will merge to 'master'. + Will merge to 'next'. -* js/no-builtins-on-disk-option (2020-08-24) 3 commits - - ci: stop linking built-ins to the dashed versions - - install: optionally skip linking/copying the built-ins - - msvc: copy the correct `.pdb` files in the Makefile target `install` +* so/pretty-abbrev-doc (2020-08-27) 1 commit + - pretty-options.txt: fix --no-abbrev-commit description - The installation procedure learned to optionally omit "git-foo" - executable files for each 'foo' built-in subcommand, which are only - required by old timers that still rely on the age old promise that - prepending "git --exec-path" output to PATH early in their script - will keep the "git-foo" calls they wrote working. + Documentation update for "--no-abbrev-commit". - The old attempt to remove these executables from the disk failed in - the 1.6 era; it may be worth attempting again, but I think it is - worth to keep this topic separate from such a policy change to help - it graduate early. + Will merge to 'next'. - cf. https://public-inbox.org/git/7vprnzt7d5.fsf@gitster.siamese.dyndns.org/ +* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits + - t7421: eliminate 'grep' check in t7421.4 for mingw compatibility + - submodule: fix style in function definition + - submodule: eliminate unused parameters from print_submodule_summary() + (this branch uses ss/submodule-summary-in-c.) -* jt/threaded-index-pack (2020-08-24) 8 commits - - fixup! index-pack: make quantum of work smaller - - index-pack: make quantum of work smaller - - index-pack: make resolve_delta() assume base data - - index-pack: calculate {ref,ofs}_{first,last} early - - index-pack: remove redundant child field - - index-pack: unify threaded and unthreaded code - - index-pack: remove redundant parameter - - Documentation: deltaBaseCacheLimit is per-thread + Fixups to a topic in 'next'. - "git index-pack" learned to resolve deltified objects with greater - parallelism. + Will merge to 'next'. -------------------------------------------------- [Stalled] +* tb/bloom-improvements (2020-08-11) 14 commits + - builtin/commit-graph.c: introduce '--max-new-filters=' + - commit-graph: rename 'split_commit_graph_opts' + - commit-graph: add large-filters bitmap chunk + - commit-graph.c: sort index into commits list + - bloom/diff: properly short-circuit on max_changes + - bloom: use provided 'struct bloom_filter_settings' + - csum-file.h: introduce 'hashwrite_be64()' + - bloom: split 'get_bloom_filter()' in two + - commit-graph.c: store maximum changed paths + - commit-graph: respect 'commitGraph.readChangedPaths' + - t/helper/test-read-graph.c: prepare repo settings + - commit-graph: pass a 'struct repository *' in more places + - t4216: use an '&&'-chain + - commit-graph: introduce 'get_bloom_filter_settings()' + + Misc Bloom filter improvements. + + Expecting a reroll. + It seems that the review is getting closer to result in another update. + cf. <20200811220503.GC66656@syl.lan> + + +* es/config-hooks (2020-07-30) 6 commits + - hook: add 'run' subcommand + - parse-options: parse into argv_array + - hook: add --porcelain to list command + - hook: add list command + - hook: scaffolding for git-hook subcommand + - doc: propose hooks managed by the config + + The "hooks defined in config" topic. + + Expecting a reroll. + Now jk/strvec is in 'master', we may want to see the topic reworked + on top of it. Are there unresolved issues, or does the topic need + a round of detailed review? + cf. + + * mt/grep-sparse-checkout (2020-06-12) 6 commits - config: add setting to ignore sparsity patterns in some cmds - grep: honor sparse checkout patterns @@ -266,13 +305,77 @@ repositories listed at -------------------------------------------------- [Cooking] +* jk/refspecs-cleanup (2020-08-17) 2 commits + (merged to 'next' on 2020-08-24 at 807a080ebf) + + refspec: make sure stack refspec_item variables are zeroed + + refspec: fix documentation referring to refspec_item + (this branch is used by jk/refspecs-negative.) + + Preliminary code clean-up before introducing "negative refspec". + + Will merge to 'master'. + + +* rs/checkout-no-overlay-pathspec-fix (2020-08-22) 1 commit + (merged to 'next' on 2020-08-27 at 277e39346d) + + checkout, restore: make pathspec recursive + + "git restore/checkout --no-overlay" with wildcarded pathspec + mistakenly removed matching paths in subdirectories, which has been + corrected. + + Will merge to 'master'. + + +* al/bisect-first-parent (2020-08-22) 1 commit + (merged to 'next' on 2020-08-24 at f95fbf45a6) + + bisect: add first-parent option to documentation + + Finishing touches. + + Will merge to 'master'. + + +* js/no-builtins-on-disk-option (2020-08-24) 3 commits + - ci: stop linking built-ins to the dashed versions + - install: optionally skip linking/copying the built-ins + - msvc: copy the correct `.pdb` files in the Makefile target `install` + + The installation procedure learned to optionally omit "git-foo" + executable files for each 'foo' built-in subcommand, which are only + required by old timers that still rely on the age old promise that + prepending "git --exec-path" output to PATH early in their script + will keep the "git-foo" calls they wrote working. + + The old attempt to remove these executables from the disk failed in + the 1.6 era; it may be worth attempting again, but I think it is + worth to keep this topic separate from such a policy change to help + it graduate early. + + cf. https://public-inbox.org/git/7vprnzt7d5.fsf@gitster.siamese.dyndns.org/ + + +* jt/threaded-index-pack (2020-08-27) 9 commits + - builtin/index-pack.c: fix some sparse warnings + - fixup! index-pack: make quantum of work smaller + - index-pack: make quantum of work smaller + - index-pack: make resolve_delta() assume base data + - index-pack: calculate {ref,ofs}_{first,last} early + - index-pack: remove redundant child field + - index-pack: unify threaded and unthreaded code + - index-pack: remove redundant parameter + - Documentation: deltaBaseCacheLimit is per-thread + + "git index-pack" learned to resolve deltified objects with greater + parallelism. + + * hn/refs-pseudorefs (2020-08-21) 4 commits (merged to 'next' on 2020-08-24 at 3579abe8ff) + sequencer: treat REVERT_HEAD as a pseudo ref + builtin/commit: suggest update-ref for pseudoref removal + sequencer: treat CHERRY_PICK_HEAD as a pseudo ref + refs: make refs_ref_exists public - (this branch uses hn/refs-fetch-head-is-special.) Accesses to two pseudorefs have been updated to properly use ref API. @@ -280,18 +383,6 @@ repositories listed at Will merge to 'master'. -* rz/complete-more-options (2020-08-19) 2 commits - (merged to 'next' on 2020-08-21 at ba8f4c8cb1) - + completion: add GIT_COMPLETION_SHOW_ALL env var - + parse-options: add --git-completion-helper-all - - Command line completion (in contrib/) usually omits redundant, - deprecated and/or dangerous options from its output; it learned to - optionally include all of them. - - Will merge to 'master'. - - * jt/promisor-pack-fix (2020-08-20) 1 commit (merged to 'next' on 2020-08-24 at cd26d30d8d) + fetch-pack: in partial clone, pass --promisor @@ -316,11 +407,12 @@ repositories listed at * jc/ident-whose-ident (2020-08-21) 1 commit - - ident: say whose identity is missing when giving user.name hint + (merged to 'next' on 2020-08-27 at caf5149c28) + + ident: say whose identity is missing when giving user.name hint Error message update. - Will merge to 'next'. + Will merge to 'master'. * jk/index-pack-w-more-threads (2020-08-21) 3 commits @@ -336,12 +428,13 @@ repositories listed at * rp/apply-cached-doc (2020-08-20) 1 commit - - git-apply.txt: update descriptions of --cached, --index + (merged to 'next' on 2020-08-27 at 1d610f08ea) + + git-apply.txt: update descriptions of --cached, --index The description of --cached/--index options in "git apply --help" has been updated. - Will merge to 'next'. + Will merge to 'master'. * dd/diff-customize-index-line-abbrev (2020-08-21) 2 commits @@ -356,51 +449,22 @@ repositories listed at Will merge to 'master'. -* hn/refs-fetch-head-is-special (2020-08-19) 4 commits - (merged to 'next' on 2020-08-21 at def233ab43) - + refs: read FETCH_HEAD and MERGE_HEAD generically - + refs: move gitdir into base ref_store - + refs: fix comment about submodule ref_stores - + refs: split off reading loose ref data in separate function - (this branch is used by hn/refs-pseudorefs.) - - The FETCH_HEAD is now always read from the filesystem regardless of - the ref backend in use, as its format is much richer than the - normal refs, and written directly by "git fetch" as a plain file.. - - Will merge to 'master'. - - * hv/ref-filter-misc (2020-08-17) 9 commits - - ref-filter: add `sanitize` option for 'subject' atom - - format-support: move `format_sanitized_subject()` from pretty - - pretty: refactor `format_sanitized_subject()` - - ref-filter: add `short` modifier to 'parent' atom - - ref-filter: add `short` modifier to 'tree' atom - - ref-filter: rename `objectname` related functions and fields - - ref-filter: modify error messages in `grab_objectname()` - - ref-filter: refactor `grab_objectname()` - - ref-filter: support different email formats + (merged to 'next' on 2020-08-27 at c015fa6b0f) + + ref-filter: add `sanitize` option for 'subject' atom + + format-support: move `format_sanitized_subject()` from pretty + + pretty: refactor `format_sanitized_subject()` + + ref-filter: add `short` modifier to 'parent' atom + + ref-filter: add `short` modifier to 'tree' atom + + ref-filter: rename `objectname` related functions and fields + + ref-filter: modify error messages in `grab_objectname()` + + ref-filter: refactor `grab_objectname()` + + ref-filter: support different email formats The "--format=" option to the "for-each-ref" command and friends learned a few more tricks, e.g. the ":short" suffix that applies to "objectname" now also can be used for "parent", "tree", etc. - Will merge to 'next'. - - -* jk/leakfix (2020-08-17) 7 commits - (merged to 'next' on 2020-08-21 at a8b25a2657) - + submodule--helper: fix leak of core.worktree value - + config: fix leak in git_config_get_expiry_in_days() - + config: drop git_config_get_string_const() - + config: fix leaks from git_config_get_string_const() - + checkout: fix leak of non-existent branch names - + submodule--helper: use strbuf_release() to free strbufs - + clear_pattern_list(): clear embedded hashmaps - - Code clean-up. - Will merge to 'master'. @@ -411,59 +475,54 @@ repositories listed at "negative refspecs" -* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit - - fetch-pack: make packfile URIs work with transfer.fsckobjects +* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-24) 3 commits + (merged to 'next' on 2020-08-27 at efd171f172) + + fetch-pack: make packfile URIs work with transfer.fsckobjects + + fetch-pack: document only_packfile in get_pack() + + (various): document from_promisor parameter Bugfix for "git fetch" when the packfile URI capability is in use. - Need to pick up a reroll. + Will merge to 'master'. * mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit - - diff: teach --stat to ignore uninteresting modifications + (merged to 'next' on 2020-08-27 at b9e97254ae) + + diff: teach --stat to ignore uninteresting modifications "git diff --stat -w" showed 0-line changes for paths whose changes were only whitespaces, which was not intuitive. We now omit such paths from the stat output. - Will merge to 'next'. + Will merge to 'master'. * pw/add-p-allowed-options-fix (2020-08-17) 2 commits - - add -p: fix checking of user input - - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW + (merged to 'next' on 2020-08-27 at 6cd62753f7) + + add -p: fix checking of user input + + add -p: use ALLOC_GROW_BY instead of ALLOW_GROW "git add -p" update. - Will merge to 'next'. - - -* en/mem-pool (2020-08-18) 3 commits - (merged to 'next' on 2020-08-19 at eff9ad46f0) - + mem-pool: use consistent pool variable name - + mem-pool: use more standard initialization and finalization - + mem-pool: add convenience functions for strdup and strndup - - API update. - Will merge to 'master'. * jt/lazy-fetch (2020-08-18) 7 commits - - fetch-pack: remove no_dependents code - - promisor-remote: lazy-fetch objects in subprocess - - fetch-pack: do not lazy-fetch during ref iteration - - fetch: only populate existing_refs if needed - - fetch: avoid reading submodule config until needed - - fetch: allow refspecs specified through stdin - - negotiator/noop: add noop fetch negotiator + (merged to 'next' on 2020-08-27 at 85f2319ba1) + + fetch-pack: remove no_dependents code + + promisor-remote: lazy-fetch objects in subprocess + + fetch-pack: do not lazy-fetch during ref iteration + + fetch: only populate existing_refs if needed + + fetch: avoid reading submodule config until needed + + fetch: allow refspecs specified through stdin + + negotiator/noop: add noop fetch negotiator Updates to on-demand fetching code in lazily cloned repositories. - Will merge to 'next'. + Will merge to 'master'. -* jx/proc-receive-hook (2020-08-24) 10 commits +* jx/proc-receive-hook (2020-08-27) 10 commits - doc: add documentation for the proc-receive hook - transport: parse report options for tracking refs - t5411: test updates of remote-tracking branches @@ -478,8 +537,12 @@ repositories listed at "git receive-pack" that accepts requests by "git push" learned to outsource most of the ref updates to the new "proc-receive" hook. + Looking good. + -* pw/rebase-i-more-options (2020-08-19) 5 commits +* pw/rebase-i-more-options (2020-08-26) 6 commits + (merged to 'next' on 2020-08-27 at c55cfeb247) + + t3436: do not run git-merge-recursive in dashed form (merged to 'next' on 2020-08-21 at ade71fd49b) + rebase: add --reset-author-date + rebase -i: support --ignore-date @@ -492,54 +555,33 @@ repositories listed at Will merge to 'master'. -* tb/bloom-improvements (2020-08-11) 14 commits - - builtin/commit-graph.c: introduce '--max-new-filters=' - - commit-graph: rename 'split_commit_graph_opts' - - commit-graph: add large-filters bitmap chunk - - commit-graph.c: sort index into commits list - - bloom/diff: properly short-circuit on max_changes - - bloom: use provided 'struct bloom_filter_settings' - - csum-file.h: introduce 'hashwrite_be64()' - - bloom: split 'get_bloom_filter()' in two - - commit-graph.c: store maximum changed paths - - commit-graph: respect 'commitGraph.readChangedPaths' - - t/helper/test-read-graph.c: prepare repo settings - - commit-graph: pass a 'struct repository *' in more places - - t4216: use an '&&'-chain - - commit-graph: introduce 'get_bloom_filter_settings()' - - Misc Bloom filter improvements. - - Expecting a reroll. - It seems that the review is getting closer to result in another update. - cf. <20200811220503.GC66656@syl.lan> - - * jk/slimmed-down (2020-08-13) 5 commits - - drop vcs-svn experiment - - make git-fast-import a builtin - - make git-bugreport a builtin - - make credential helpers builtins - - Makefile: drop builtins from MSVC pdb list + (merged to 'next' on 2020-08-27 at bc8e9450c6) + + drop vcs-svn experiment + + make git-fast-import a builtin + + make git-bugreport a builtin + + make credential helpers builtins + + Makefile: drop builtins from MSVC pdb list Trim an unused binary and turn a bunch of commands into built-in. - Will merge to 'next'. + Will merge to 'master'. * ss/t7401-modernize (2020-08-21) 5 commits - - t7401: add a NEEDSWORK - - t7401: change indentation for enhanced readability - - t7401: change syntax of test_i18ncmp calls for clarity - - t7401: use 'short' instead of 'verify' and cut in rev-parse calls - - t7401: modernize style + (merged to 'next' on 2020-08-27 at 516cba9c64) + + t7401: add a NEEDSWORK + + t7401: change indentation for enhanced readability + + t7401: change syntax of test_i18ncmp calls for clarity + + t7401: use 'short' instead of 'verify' and cut in rev-parse calls + + t7401: modernize style Test clean-up. - Will merge to 'next'. + Will merge to 'master'. -* ds/maintenance-part-2 (2020-08-18) 8 commits +* ds/maintenance-part-2 (2020-08-25) 8 commits - maintenance: add incremental-repack auto condition - maintenance: auto-size incremental-repack batch - maintenance: add incremental-repack task @@ -560,10 +602,11 @@ repositories listed at + t7421: introduce a test script for verifying 'summary' output + submodule: rename helper functions to avoid ambiguity + submodule: remove extra line feeds between callback struct and macro + (this branch is used by ss/submodule-summary-in-c-fixes.) Yet another subcommand of "git submodule" is getting rewritten in C. - Will merge to 'master'. + Looking good. * am/ci-wsfix (2020-08-21) 1 commit @@ -575,7 +618,7 @@ repositories listed at Will merge to 'master'. -* ds/maintenance-part-1 (2020-08-18) 11 commits +* ds/maintenance-part-1 (2020-08-25) 11 commits - maintenance: add trace2 regions for task execution - maintenance: add auto condition for commit-graph task - maintenance: use pointers to check --auto @@ -594,43 +637,3 @@ repositories listed at cleaning. Comments? - - -* es/config-hooks (2020-07-30) 6 commits - - hook: add 'run' subcommand - - parse-options: parse into argv_array - - hook: add --porcelain to list command - - hook: add list command - - hook: scaffolding for git-hook subcommand - - doc: propose hooks managed by the config - - The "hooks defined in config" topic. - - Expecting a reroll. - Now jk/strvec is in 'master', we may want to see the topic reworked - on top of it. Are there unresolved issues, or does the topic need - a round of detailed review? - cf. - --------------------------------------------------- -[Discarded] - -* rs/fast-export-anon-simplify (2020-08-13) 1 commit - . fast-export: factor out print_oid() - - Code simplification. - - Retracted. - cf. <6e2d4472-8293-4f10-0ba6-82ae83f7a465@web.de> - - -* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits - . hex: make hash_to_hex_algop() and friends thread-safe - . compat/win32/pthread: add pthread_once() - - hash_to_hex() used a set of rotating static buffers, which was not - safe to use in a threaded environment. This has been made safer by - using thread-local storage. - - Retracted. - cf.