Here are the topics that have been cooking. Commits prefixed with '-' are
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.
You can find the changes described here in the integration branches of the
repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[New Topics]
* kk/build-portability-fix (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 63f2672632)
+ Fit to Plan 9's ANSI/POSIX compatibility layer
Portability tweak for some shell scripts used while building.
Will merge to 'master'.
* al/ref-filter-merged-and-no-merged (2020-09-16) 3 commits
(merged to 'next' on 2020-09-16 at b04e306660)
+ ref-filter: allow merged and no-merged filters
+ Doc: cover multiple contains/no-contains filters
+ t3201: test multiple branch filter combinations
"git for-each-ref" and friends that list refs used to allow only
one --merged or --no-merged to filter them; they learned to take
combination of both kind of filtering.
Will merge to 'master'.
* bc/faq-misc (2020-09-14) 3 commits
- docs: explain how to deal with files that are always modified
- docs: explain why reverts are not always applied on merge
- docs: explain why squash merges are broken with long-running branches
More FAQ entries.
Expecting a reroll.
cf. <20200913171206.GO241078@xxxxxxxxxxxxxxxxxxxxxxxxx>
* sb/clone-origin (2020-09-11) 4 commits
- clone: allow configurable default for `-o`/`--origin`
- clone: validate --origin option before use
- clone: call git_config before parse_options
- clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Expecting an update.
* sk/force-if-includes (2020-09-14) 8 commits
- SQUASH???
- t: add tests for "force-if-includes"
- doc: add reference for "--[no-]force-if-includes"
- builtin/push: add option "--[no-]force-if-includes"
- transport-helper: update ref status for "force-if-includes"
- send-pack: check ref status for "force-if-includes"
- transport: add flag for "--[no-]force-if-includes"
- remote: add reflog check for "force-if-includes"
* ab/mediawiki-fixes (2020-09-16) 15 commits
- remote-mediawiki tests: annotate failing tests
- remote-mediawiki: fix duplicate revisions being imported
- remote-mediawiki tests: use CLI installer
- remote-mediawiki tests: use inline PerlIO for readability
- remote-mediawiki tests: replace deprecated Perl construct
- remote-mediawiki tests: use a more idiomatic dispatch table
- remote-mediawiki tests: use "$dir/" instead of "$dir."
- remote-mediawiki tests: change `[]` to `test`
- remote-mediawiki tests: guard test_cmp with test_path_is_file
- remote-mediawiki tests: use test_cmp in tests
- remote-mediawiki tests: use a 10 character password
- remote-mediawiki tests: use the login/password variables
- remote-mediawiki doc: bump recommended PHP version to 7.3
- remote-mediawiki doc: link to MediaWiki's current version
- remote-mediawiki doc: correct link to GitHub project
Modernization and fixes to MediaWiki remote backend.
Will merge to 'next'.
* ar/fetch-ipversion-in-all (2020-09-15) 1 commit
- fetch: pass --ipv4 and --ipv6 options to sub-fetches
"git fetch --all --ipv4/--ipv6" forgot to pass the protocol options
to instances of the "git fetch" that talk to individual remotes,
which has been corrected.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* bc/clone-with-git-default-hash-fix (2020-09-15) 1 commit
- builtin/clone: avoid failure with GIT_DEFAULT_HASH
"git clone" that clones from SHA-1 repository, while
GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
unusable repository that half-claims to be SHA-256 repository
with SHA-1 objects and refs. This has been corrected.
Expecting a reroll.
* cd/commit-graph-doc (2020-09-15) 1 commit
(merged to 'next' on 2020-09-16 at b0816b6eb0)
+ commit-graph-format.txt: fix no-parent value
Doc update.
Will merge to 'master'.
* hn/reftable (2020-09-16) 13 commits
- reftable: "test-tool dump-reftable" command.
- reftable: rest of library
- reftable: file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: utility functions
- reftable: add a barebones unittest framework
- vcxproj: adjust for the reftable changes
- reftable: define the public API
- reftable: add LICENSE
--------------------------------------------------
[Stalled]
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@xxxxxxxxxxxxxxxxxxxxxx>
cf. <xmqqft85i72s.fsf@xxxxxxxxxxxxxxxxxxxxxx>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@xxxxxxxxxxxxxxxxxxxxxx>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* 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-11) 7 commits
- maintenance: add troubleshooting guide to docs
- 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
(merged to 'next' on 2020-09-16 at d919bb3d1f)
+ 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 and teach "format-patch --range-diff=<prev>
<origin>..HEAD" not ignore <origin> when <prev> is a single
version.
Will merge to 'master'.
* es/wt-add-detach (2020-09-06) 3 commits
(merged to 'next' on 2020-09-10 at abd83f90e7)
+ 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 that the "-d" is a synonym to "--detach"
option to create a new worktree without being on a branch.
Will merge to 'master'.
* 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-10) 7 commits
(merged to 'next' on 2020-09-10 at 3bfde81846)
+ 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: code clarification
+ 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.
Will merge to 'master'.
* 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
(merged to 'next' on 2020-09-10 at b6d9ed060e)
+ submodule: suppress checking for file name and ref ambiguity for object ids
Optimization around submodule handling.
Will merge to 'master'.
* os/fetch-submodule-optim (2020-09-06) 1 commit
(merged to 'next' on 2020-09-16 at fa39e3f211)
+ fetch: do not look for submodule changes in unchanged refs
Optimization around submodule handling.
Will merge to 'master'.
* pw/add-p-edit-ita-path (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 7540ed3c0e)
+ 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 'master'.
* 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
(merged to 'next' on 2020-09-16 at f2e065ec17)
+ refs: add GIT_TRACE_REFS debugging mechanism
Developer support.
Will merge to 'master'.
* jc/dist-tarball-tweak (2020-09-09) 1 commit
(merged to 'next' on 2020-09-10 at 36cbe7ee9e)
+ Makefile: allow extra tweaking of distribution tarball
Allow maintainers to tweak $(TAR) invocations done while making
distribution tarballs.
Will merge to 'master'.
* mt/config-fail-nongit-early (2020-09-09) 1 commit
(merged to 'next' on 2020-09-10 at 6f77f65b4e)
+ 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 'master'.
* tb/bloom-improvements (2020-09-16) 13 commits
- commit-graph: introduce 'commitGraph.maxNewFilters'
- 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.
Will merge to 'next'.
* 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-16) 1 commit
(merged to 'next' on 2020-09-16 at 01985a671b)
+ mergetool: allow 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 'master'.
* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
(merged to 'next' on 2020-09-10 at 7853fe7e12)
+ 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 'master'.
cf. <xmqqzh667ca4.fsf@xxxxxxxxxxxxxxxxxxxxxx>
* 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-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* mr/bisect-in-c-2 (2020-08-31) 13 commits
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: finish porting `bisect_start()` to C
- bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
- bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
- bisect--helper: reimplement `bisect_autostart` shell function in C
- bisect--helper: introduce new `write_in_file()` function
- bisect--helper: use '-res' in 'cmd_bisect__helper' return
- bisect--helper: BUG() in cmd_*() on invalid subcommand
Rewrite of the "git bisect" script in C continues.
At v7; getting close
cf. <nycvar.QRO.7.76.6.2009031403510.56@xxxxxxxxxxxxxxxxx>
* 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.
Expecting a reroll to update log message for the last one.
as it confused at least two reviewers.
cf. <xmqqwo1baop3.fsf@xxxxxxxxxxxxxxxxxxxxxx>
cf. <20200903104537.GA27325@xxxxxxxxxx>
* jt/threaded-index-pack (2020-09-08) 7 commits
(merged to 'next' on 2020-09-16 at 8542385cc0)
+ 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.
Will merge to 'master'.
* jk/refspecs-negative (2020-08-21) 1 commit
- refspec: add support for negative refspecs
"negative refspecs"
* 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
- receive-pack: new config receive.procReceiveRefs
- doc: add document for capability report-status-v2
- New capability "report-status-v2" for git-push
- receive-pack: feed report options to post-receive
- receive-pack: add new proc-receive hook
- t5411: add basic test cases for proc-receive hook
- transport: not report a non-head push as a branch
"git receive-pack" that accepts requests by "git push" learned to
outsource most of the ref updates to the new "proc-receive" hook.
Will merge to 'next'.
* 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
- midx: use start_delayed_progress()
- midx: enable core.multiPackIndex by default
- maintenance: create auto condition for loose-objects
- maintenance: add loose-objects task
- maintenance: add prefetch task
(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.
* 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
- maintenance: create maintenance.<task>.enabled config
- maintenance: take a lock on the objects directory
- maintenance: add --task option
- maintenance: add commit-graph task
- maintenance: initialize task array
- maintenance: replace run_auto_gc()
- maintenance: add --quiet option
- maintenance: create basic maintenance runner
(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.
On hold.
cf. <0b35829f-a83b-a093-2dc5-0e7d3b42fd15@xxxxxxxxx>
--------------------------------------------------
[Discarded]
* jc/remove-pack-redundant (2020-08-25) 1 commit
. pack-redundant: gauge the usage before proposing its removal
The first step to remove "git pack-redundant" by soliciting
objections.
Stop--we had some activity as late as last year.
