mirror of
https://github.com/git/git.git
synced 2026-01-12 13:53:11 +09:00
What's cooking (2020/09) #03
This commit is contained in:
Junio C Hamano
parent
278c16229b
commit
384c6afcfa
@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Sep 2020, #02; Thu, 3)
|
||||
X-master-at: 3a238e539bcdfe3f9eb5010fd218640c1b499f7a
|
||||
X-next-at: f4bc123cb7519b4205da0f439b0cefc5a5f176ac
|
||||
Subject: What's cooking in git.git (Sep 2020, #03; Wed, 9)
|
||||
X-master-at: 54e85e7af1ac9e9a92888060d6811ae767fea1bc
|
||||
X-next-at: a41e38b8ca5c1f61d7a6b4dd5e741fcd76907bf1
|
||||
|
||||
What's cooking in git.git (Sep 2020, #02; Thu, 3)
|
||||
What's cooking in git.git (Sep 2020, #03; Wed, 9)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
@ -20,146 +20,43 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* hl/bisect-doc-clarify-bad-good-ordering (2020-08-28) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 11ce613916)
|
||||
+ bisect: swap command-line options in documentation
|
||||
* es/worktree-repair (2020-08-31) 5 commits
|
||||
(merged to 'next' on 2020-08-31 at 604825c5e4)
|
||||
+ 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
|
||||
|
||||
Doc update.
|
||||
"git worktree" gained a "repair" subcommand to help users recover
|
||||
after moving the worktrees or repository manually without telling
|
||||
Git. Also, "git init --separate-git-dir" no longer corrupts
|
||||
administrative data related to linked worktrees.
|
||||
|
||||
|
||||
* jc/post-checkout-doc (2020-08-27) 1 commit
|
||||
(merged to 'next' on 2020-09-02 at bb06b5f978)
|
||||
+ doc: clarify how exit status of post-checkout hook is used
|
||||
* hv/ref-filter-misc (2020-08-28) 8 commits
|
||||
(merged to 'next' on 2020-09-02 at 9a8bb84f20)
|
||||
+ ref-filter: add `sanitize` option for 'subject' atom
|
||||
+ 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
|
||||
|
||||
Doc update.
|
||||
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.
|
||||
|
||||
|
||||
* 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
|
||||
* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 220fc43629)
|
||||
+ worktree: fix leak in check_clean_worktree()
|
||||
|
||||
Various callers of run_command API has been modernized.
|
||||
Leakfix.
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
* jk/slimmed-down (2020-08-13) 5 commits
|
||||
(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.
|
||||
|
||||
|
||||
* jk/xrealloc-avoid-use-after-free (2020-09-02) 1 commit
|
||||
(merged to 'next' on 2020-09-02 at a1ad92fe1c)
|
||||
+ xrealloc: do not reuse pointer freed by zero-length realloc()
|
||||
|
||||
It was possible for xrealloc() to send a non-NULL pointer that has
|
||||
been freed, which has been fixed.
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
* jt/lazy-fetch (2020-09-02) 8 commits
|
||||
(merged to 'next' on 2020-09-02 at 1f8cd016d4)
|
||||
+ fetch: no FETCH_HEAD display if --no-write-fetch-head
|
||||
(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.
|
||||
|
||||
|
||||
* mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit
|
||||
(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.
|
||||
|
||||
|
||||
* pb/doc-external-diff-env (2020-09-01) 1 commit
|
||||
(merged to 'next' on 2020-09-02 at a789fe3fd9)
|
||||
+ git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
|
||||
|
||||
Doc update.
|
||||
|
||||
|
||||
* pb/doc-sequence-editor-configuration (2020-08-31) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 506466270c)
|
||||
+ doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more
|
||||
|
||||
Doc update.
|
||||
|
||||
|
||||
* pw/add-p-allowed-options-fix (2020-08-17) 2 commits
|
||||
(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.
|
||||
|
||||
|
||||
* 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
|
||||
+ rebase -i: support --committer-date-is-author-date
|
||||
+ am: stop exporting GIT_COMMITTER_DATE
|
||||
+ rebase -i: add --ignore-whitespace flag
|
||||
|
||||
"git rebase -i" learns a bit more options.
|
||||
|
||||
|
||||
* so/pretty-abbrev-doc (2020-08-27) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at d664bd0c06)
|
||||
+ pretty-options.txt: fix --no-abbrev-commit description
|
||||
|
||||
Documentation update for "--no-abbrev-commit".
|
||||
|
||||
|
||||
* ss/t7401-modernize (2020-08-21) 5 commits
|
||||
(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.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* js/ci-squelch-false-failure (2020-09-02) 2 commits
|
||||
(merged to 'next' on 2020-09-03 at 254f390305)
|
||||
+ ci: avoid ugly "failure" in the `ci-config` job
|
||||
@ -167,27 +64,296 @@ repositories listed at
|
||||
|
||||
CI noise reduction.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* jt/interpret-branch-name-fallback (2020-09-02) 3 commits
|
||||
(merged to 'next' on 2020-09-03 at 28914ab788)
|
||||
+ wt-status: tolerate dangling marks
|
||||
+ refs: move dwim_ref() to header file
|
||||
+ sha1-name: replace unsigned int with option struct
|
||||
|
||||
"git status" has trouble showing where it came from by interpreting
|
||||
reflog entries that recordcertain events, e.g. "checkout @{u}", and
|
||||
gives a hard/fatal error. Even though it inherently is impossible
|
||||
to give a correct answer because the reflog entries lose some
|
||||
information (e.g. "@{u}" does not record what branch the user was
|
||||
on hence which branch 'the upstream' needs to be computed, and even
|
||||
if the record were available, the relationship between branches may
|
||||
have changed), at least hide the error to allow "status" show its
|
||||
output.
|
||||
|
||||
|
||||
* pb/clang-json-compilation-database (2020-09-02) 1 commit
|
||||
- Makefile: add support for generating JSON compilation database
|
||||
|
||||
Developer support.
|
||||
|
||||
Waiting for a response to a sanity check.
|
||||
cf. <xmqq1rjkccw8.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* os/vcbuild (2020-09-03) 2 commits
|
||||
* os/vcbuild (2020-09-08) 3 commits
|
||||
(merged to 'next' on 2020-09-08 at 56551401c2)
|
||||
+ contrib/buildsystems: fix expat library name for generated vcxproj
|
||||
(merged to 'next' on 2020-09-03 at 0216ec9cb9)
|
||||
+ vcbuild: fix batch file name in README
|
||||
+ vcbuild: fix library name for expat with make MSVC=1
|
||||
|
||||
Fix build procedure for MSVC.
|
||||
|
||||
|
||||
* pb/imap-send-updates (2020-08-31) 3 commits
|
||||
(merged to 'next' on 2020-09-02 at 899fca3919)
|
||||
+ git-imap-send.txt: add note about localized Gmail folders
|
||||
+ git-imap-send.txt: do verify SSL certificate for gmail.com
|
||||
+ git-imap-send.txt: don't duplicate 'Examples' sections
|
||||
|
||||
"git imap-send" updates.
|
||||
|
||||
|
||||
* so/separate-field-for-m-and-diff-merges (2020-08-31) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 8def2984ca)
|
||||
+ revision: add separate field for "-m" of "diff-index -m"
|
||||
|
||||
Internal API clean-up to handle two options "diff-index" and "log"
|
||||
have, which happen to share the same short form, more sensibly.
|
||||
|
||||
|
||||
* ss/submodule-summary-in-c (2020-08-12) 4 commits
|
||||
(merged to 'next' on 2020-08-17 at 9bc352cb70)
|
||||
+ submodule: port submodule subcommand 'summary' from shell to C
|
||||
+ 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.
|
||||
|
||||
|
||||
* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits
|
||||
(merged to 'next' on 2020-09-02 at 7f959811b8)
|
||||
+ 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.)
|
||||
|
||||
Fixups to a topic in 'next'.
|
||||
|
||||
|
||||
* tb/repack-clearing-midx (2020-08-28) 2 commits
|
||||
(merged to 'next' on 2020-08-28 at 4204c0cb5e)
|
||||
+ midx: traverse the local MIDX first
|
||||
(merged to 'next' on 2020-08-27 at a465875cbb)
|
||||
+ builtin/repack.c: invalidate MIDX only when necessary
|
||||
|
||||
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.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* al/t3200-back-on-a-branch (2020-09-08) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at 833e2fc60c)
|
||||
+ t3200: clean side effect of git checkout --orphan
|
||||
|
||||
Test fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* bc/rev-parse-path-format (2020-09-08) 1 commit
|
||||
- rev-parse: add option for absolute or relative path formatting
|
||||
|
||||
"git rev-parse" can be explicitly told to give output as absolute
|
||||
or relative path.
|
||||
|
||||
|
||||
* ds/maintenance-part-3 (2020-09-06) 6 commits
|
||||
- maintenance: recommended schedule in register/start
|
||||
- maintenance: add start/stop subcommands
|
||||
- maintenance: add [un]register subcommands
|
||||
- for-each-repo: run subcommands on configured repos
|
||||
- maintenance: add --schedule option and config
|
||||
- maintenance: optionally skip --auto process
|
||||
(this branch uses ds/maintenance-part-1 and ds/maintenance-part-2.)
|
||||
|
||||
Parts of "git maintenance" to ease writing crontab entries (and
|
||||
other scheduling system configuration) for it.
|
||||
|
||||
|
||||
* ea/blame-use-oideq (2020-09-08) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at babefe4727)
|
||||
+ blame.c: replace instance of !oidcmp for oideq
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits
|
||||
- format-patch: use 'origin' as start of current-series-range when known
|
||||
- diff-lib: tighten show_interdiff()'s interface
|
||||
- diff: move show_interdiff() from its own file to diff-lib
|
||||
|
||||
Code cleanup with a slight behaviour change when "format-patch
|
||||
--range-diff=<prev> origin..HEAD" gives a single revision to
|
||||
<prev>.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* es/wt-add-detach (2020-09-06) 3 commits
|
||||
- git-worktree.txt: discuss branch-based vs. throwaway worktrees
|
||||
- worktree: teach `add` to recognize -d as shorthand for --detach
|
||||
- git-checkout.txt: document -d short option for --detach
|
||||
|
||||
"git worktree add" learns the "--detach" option to create a new
|
||||
worktree without being on a branch.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* hn/refs-ref-log-only-bit (2020-09-08) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at f729cb2c81)
|
||||
+ refs: move REF_LOG_ONLY to refs-internal.h
|
||||
|
||||
A bit of API reshuffling to make sure stuff common to all backends
|
||||
are not defined only in files backend.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/add-i-use-builtin-experimental (2020-09-08) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at abcb7515dc)
|
||||
+ add -i: use the built-in version when feature.experimental is set
|
||||
|
||||
The "add -i/-p" machinery has been written in C but it is not used
|
||||
by default yet. It is made default to those who are participating
|
||||
in feature.experimental experiment.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/quote-path-cleanup (2020-09-08) 6 commits
|
||||
- quote: turn 'nodq' parameter into a set of flags
|
||||
- quote: rename misnamed sq_lookup[] to cq_lookup[]
|
||||
- wt-status: consistently quote paths in "status --short" output
|
||||
- quote_path: optionally allow quoting a path with SP in it
|
||||
- quote_path: give flags parameter to quote_path()
|
||||
- quote_path: rename quote_path_relative() to quote_path()
|
||||
|
||||
"git status --short" quoted a path with SP in it when tracked, but
|
||||
not those that are untracked, ignored or unmerged. They are all
|
||||
shown quoted consistently.
|
||||
|
||||
Undecided.
|
||||
This is more involved than alternatives proposed by brian and Réne
|
||||
and I am not sure extra changes to the codebase is a net positive.
|
||||
cf. <20200908013013.1099937-1-sandals@crustytoothpaste.net>
|
||||
cf. <3a72c5f2-35cc-a865-d5f2-02706c48d8ec@web.de>
|
||||
|
||||
|
||||
* jk/add-i-fixes (2020-09-08) 2 commits
|
||||
(merged to 'next' on 2020-09-09 at 46ea071a7a)
|
||||
+ add--interactive.perl: specify --no-color explicitly
|
||||
+ add-patch: fix inverted return code of repo_read_index()
|
||||
|
||||
"add -i/-p" fixes.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* os/collect-changed-submodules-optim (2020-09-06) 1 commit
|
||||
- submodule: suppress checking for file name and ref ambiguity for object ids
|
||||
|
||||
Optimization around submodule handling.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* os/fetch-submodule-optim (2020-09-06) 1 commit
|
||||
- fetch: do not look for submodule changes in unchanged refs
|
||||
|
||||
Optimization around submodule handling.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* pw/add-p-edit-ita-path (2020-09-09) 1 commit
|
||||
- add -p: fix editing of intent-to-add paths
|
||||
|
||||
"add -p" did not allow editing paths that were only added in
|
||||
intent.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* pw/add-p-leakfix (2020-09-08) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at 4206d0503c)
|
||||
+ add -p: fix memory leak
|
||||
|
||||
Leakfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rs/misc-cleanups (2020-09-06) 3 commits
|
||||
(merged to 'next' on 2020-09-09 at 4a19ea9672)
|
||||
+ pack-bitmap-write: use hashwrite_be32() in write_hash_cache()
|
||||
+ midx: use hashwrite_u8() in write_midx_header()
|
||||
+ fast-import: use write_pack_header()
|
||||
|
||||
Misc cleanups.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rs/parallel-read-cache-fix (2020-09-06) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at 92953a75c4)
|
||||
+ read-cache: fix mem-pool allocation for multi-threaded index loading
|
||||
|
||||
A follow-up fix to a topic already in 'master'.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rs/refspec-leakfix (2020-09-06) 2 commits
|
||||
(merged to 'next' on 2020-09-09 at 10741e90a5)
|
||||
+ refspec: add and use refspec_appendf()
|
||||
+ push: release strbufs used for refspec formatting
|
||||
|
||||
Leakfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* so/log-tree-diff-cleanup (2020-09-06) 2 commits
|
||||
(merged to 'next' on 2020-09-09 at f8744b8e8a)
|
||||
+ log_tree_diff: get rid of extra check for NULL
|
||||
+ log_tree_diff: get rid of code duplication for first_parent_only
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* hn/refs-trace-backend (2020-09-09) 1 commit
|
||||
- refs: add GIT_TRACE_REFS debugging mechanism
|
||||
|
||||
Developer support.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jc/dist-tarball-tweak (2020-09-09) 1 commit
|
||||
- Makefile: allow extra tweaking of distribution tarball
|
||||
|
||||
Allow maintainers to tweak $(TAR) invocations done while making
|
||||
distribution tarballs.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mt/config-fail-nongit-early (2020-09-09) 1 commit
|
||||
- config: complain about --worktree outside of a git repo
|
||||
|
||||
Unlike "git config --local", "git config --worktree" did not fail
|
||||
early and cleanly when started outside a git repository.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
@ -210,68 +376,6 @@ repositories listed at
|
||||
On hold for now.
|
||||
|
||||
|
||||
* tb/bloom-improvements (2020-08-11) 14 commits
|
||||
- builtin/commit-graph.c: introduce '--max-new-filters=<n>'
|
||||
- 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. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* ls/mergetool-meld-auto-merge (2020-07-12) 2 commits
|
||||
- SQUASH???
|
||||
- Support auto-merge for meld to follow the vim-diff behavior
|
||||
|
||||
The 'meld' backend of the "git mergetool" learned to give the
|
||||
underlying 'meld' the '--auto-merge' option, which would help
|
||||
reduce the amount of text that requires manual merging.
|
||||
|
||||
Expecting a reroll.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
"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.
|
||||
|
||||
Needs tests.
|
||||
|
||||
|
||||
* dr/push-remoteref-fix (2020-04-23) 1 commit
|
||||
- remote.c: fix handling of %(push:remoteref)
|
||||
|
||||
@ -283,6 +387,7 @@ repositories listed at
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
|
||||
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
|
||||
@ -295,6 +400,70 @@ repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* tb/bloom-improvements (2020-09-09) 12 commits
|
||||
- builtin/commit-graph.c: introduce '--max-new-filters=<n>'
|
||||
- commit-graph: rename 'split_commit_graph_opts'
|
||||
- bloom: encode out-of-bounds filters as non-empty
|
||||
- bloom/diff: properly short-circuit on max_changes
|
||||
- bloom: use provided 'struct bloom_filter_settings'
|
||||
- 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()'
|
||||
|
||||
"git commit-graph write" learned to limit the number of bloom
|
||||
filters that are computed from scratch with the --max-new-filters
|
||||
option.
|
||||
|
||||
|
||||
* es/config-hooks (2020-09-09) 9 commits
|
||||
- run_commit_hook: take strvec instead of varargs
|
||||
- commit: use config-based hooks
|
||||
- hook: replace run-command.h:find_hook
|
||||
- hook: add 'run' subcommand
|
||||
- parse-options: parse into strvec
|
||||
- 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.
|
||||
|
||||
|
||||
* ls/mergetool-meld-auto-merge (2020-09-09) 1 commit
|
||||
- Support auto-merge for meld to follow the vim-diff behavior
|
||||
|
||||
The 'meld' backend of the "git mergetool" learned to give the
|
||||
underlying 'meld' the '--auto-merge' option, which would help
|
||||
reduce the amount of text that requires manual merging.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
"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'.
|
||||
cf. <xmqqzh667ca4.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* pb/clang-json-compilation-database (2020-09-06) 1 commit
|
||||
(merged to 'next' on 2020-09-09 at 9f5ea136f1)
|
||||
+ Makefile: add support for generating JSON compilation database
|
||||
|
||||
Developer support.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mt/grep-sparse-checkout (2020-09-02) 8 commits
|
||||
- config: add setting to ignore sparsity patterns in some cmds
|
||||
- grep: honor sparse checkout patterns
|
||||
@ -309,46 +478,6 @@ repositories listed at
|
||||
paths.
|
||||
|
||||
|
||||
* jt/interpret-branch-name-fallback (2020-09-02) 3 commits
|
||||
(merged to 'next' on 2020-09-03 at 28914ab788)
|
||||
+ wt-status: tolerate dangling marks
|
||||
+ refs: move dwim_ref() to header file
|
||||
+ sha1-name: replace unsigned int with option struct
|
||||
|
||||
"git status" has trouble showing where it came from by interpreting
|
||||
reflog entries that recordcertain events, e.g. "checkout @{u}", and
|
||||
gives a hard/fatal error. Even though it inherently is impossible
|
||||
to give a correct answer because the reflog entries lose some
|
||||
information (e.g. "@{u}" does not record what branch the user was
|
||||
on hence which branch 'the upstream' needs to be computed, and even
|
||||
if the record were available, the relationship between branches may
|
||||
have changed), at least hide the error to allow "status" show its
|
||||
output.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* pb/imap-send-updates (2020-08-31) 3 commits
|
||||
(merged to 'next' on 2020-09-02 at 899fca3919)
|
||||
+ git-imap-send.txt: add note about localized Gmail folders
|
||||
+ git-imap-send.txt: do verify SSL certificate for gmail.com
|
||||
+ git-imap-send.txt: don't duplicate 'Examples' sections
|
||||
|
||||
"git imap-send" updates.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* so/separate-field-for-m-and-diff-merges (2020-08-31) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 8def2984ca)
|
||||
+ revision: add separate field for "-m" of "diff-index -m"
|
||||
|
||||
Internal API clean-up to handle two options "diff-index" and "log"
|
||||
have, which happen to share the same short form, more sensibly.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ew/decline-core-abbrev (2020-09-01) 1 commit
|
||||
- core.abbrev <off|false|no> disables abbreviations
|
||||
|
||||
@ -379,57 +508,6 @@ repositories listed at
|
||||
cf. <nycvar.QRO.7.76.6.2009031403510.56@tvgsbejvaqbjf.bet>
|
||||
|
||||
|
||||
* tb/repack-clearing-midx (2020-08-28) 2 commits
|
||||
(merged to 'next' on 2020-08-28 at 4204c0cb5e)
|
||||
+ midx: traverse the local MIDX first
|
||||
(merged to 'next' on 2020-08-27 at a465875cbb)
|
||||
+ builtin/repack.c: invalidate MIDX only when necessary
|
||||
|
||||
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.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/worktree-repair (2020-08-31) 5 commits
|
||||
(merged to 'next' on 2020-08-31 at 604825c5e4)
|
||||
+ 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 worktree" gained a "repair" subcommand to help users recover
|
||||
after moving the worktrees or repository manually without telling
|
||||
Git. Also, "git init --separate-git-dir" no longer corrupts
|
||||
administrative data related to linked worktrees.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit
|
||||
(merged to 'next' on 2020-08-31 at 220fc43629)
|
||||
+ worktree: fix leak in check_clean_worktree()
|
||||
|
||||
Leakfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits
|
||||
(merged to 'next' on 2020-09-02 at 7f959811b8)
|
||||
+ 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.)
|
||||
|
||||
Fixups to a topic in 'next'.
|
||||
|
||||
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
|
||||
@ -452,9 +530,7 @@ repositories listed at
|
||||
cf. <20200903104537.GA27325@szeder.dev>
|
||||
|
||||
|
||||
* 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
|
||||
* jt/threaded-index-pack (2020-09-08) 7 commits
|
||||
- index-pack: make quantum of work smaller
|
||||
- index-pack: make resolve_delta() assume base data
|
||||
- index-pack: calculate {ref,ofs}_{first,last} early
|
||||
@ -466,26 +542,7 @@ repositories listed at
|
||||
"git index-pack" learned to resolve deltified objects with greater
|
||||
parallelism.
|
||||
|
||||
Expecting the final reroll.
|
||||
cf. https://colabti.org/irclogger/irclogger_log/git-devel?date=2020-08-31#l82
|
||||
|
||||
|
||||
* hv/ref-filter-misc (2020-08-28) 8 commits
|
||||
(merged to 'next' on 2020-09-02 at 9a8bb84f20)
|
||||
+ ref-filter: add `sanitize` option for 'subject' atom
|
||||
+ 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 'master'.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/refspecs-negative (2020-08-21) 1 commit
|
||||
@ -509,10 +566,10 @@ 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.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ds/maintenance-part-2 (2020-08-25) 8 commits
|
||||
* ds/maintenance-part-2 (2020-09-06) 8 commits
|
||||
- maintenance: add incremental-repack auto condition
|
||||
- maintenance: auto-size incremental-repack batch
|
||||
- maintenance: add incremental-repack task
|
||||
@ -521,26 +578,13 @@ repositories listed at
|
||||
- maintenance: create auto condition for loose-objects
|
||||
- maintenance: add loose-objects task
|
||||
- maintenance: add prefetch task
|
||||
(this branch uses ds/maintenance-part-1.)
|
||||
(this branch is used by ds/maintenance-part-3; uses ds/maintenance-part-1.)
|
||||
|
||||
"git maintenance", an extended big brother of "git gc", continues
|
||||
to evolve.
|
||||
|
||||
|
||||
* ss/submodule-summary-in-c (2020-08-12) 4 commits
|
||||
(merged to 'next' on 2020-08-17 at 9bc352cb70)
|
||||
+ submodule: port submodule subcommand 'summary' from shell to C
|
||||
+ 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'.
|
||||
|
||||
|
||||
* ds/maintenance-part-1 (2020-08-25) 11 commits
|
||||
* ds/maintenance-part-1 (2020-09-06) 11 commits
|
||||
- maintenance: add trace2 regions for task execution
|
||||
- maintenance: add auto condition for commit-graph task
|
||||
- maintenance: use pointers to check --auto
|
||||
@ -552,14 +596,13 @@ repositories listed at
|
||||
- maintenance: replace run_auto_gc()
|
||||
- maintenance: add --quiet option
|
||||
- maintenance: create basic maintenance runner
|
||||
(this branch is used by ds/maintenance-part-2.)
|
||||
(this branch is used by ds/maintenance-part-2 and ds/maintenance-part-3.)
|
||||
|
||||
A "git gc"'s big brother has been introduced to take care of more
|
||||
repository maintenance tasks, not limited to the object database
|
||||
cleaning.
|
||||
|
||||
Almost ready for 'next'.
|
||||
cf. https://colabti.org/irclogger/irclogger_log/git-devel?date=2020-08-31#l44
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user