What's cooking (2020/07 #01)
Junio C Hamano
parent
fff587ab21
commit
06ad1f9e05
|
|
@ -1,10 +1,10 @@
|
|||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Jun 2020, #06; Mon, 29)
|
||||
X-master-at: a08a83db2bf27f015bec9a435f6d73e223c21c5e
|
||||
X-next-at: 050319c2ae82f2fac00eac9d80a1d91394d99aec
|
||||
Subject: What's cooking in git.git (Jul 2020, #01; Mon, 6)
|
||||
X-master-at: 4a0fcf9f760c9774be77f51e1e88a7499b53d2e2
|
||||
X-next-at: b3809f4674cea6e2f5db8a478a39b85851690c7d
|
||||
|
||||
What's cooking in git.git (Jun 2020, #06; Mon, 29)
|
||||
What's cooking in git.git (Jul 2020, #01; Mon, 6)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
|
|
@ -12,11 +12,10 @@ 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.
|
||||
|
||||
More topics graduate to the 'master' and to the 'next' branches. I
|
||||
expect that this week would be slower than usual due to US holidays
|
||||
but hopefully we'd be able to merge most of the impactful topics by
|
||||
the -rc0. Some large-ish topics may have to be left for the next
|
||||
cycle, as usual.
|
||||
We are about to tag the -rc0 "preview" and enter pre-release freeze
|
||||
period. The change to let users name the initial branch that gets
|
||||
prepared in a newly created repository has now been merged to be
|
||||
included in the upcoming release.
|
||||
|
||||
You can find the changes described here in the integration branches of the
|
||||
repositories listed at
|
||||
|
|
@ -24,74 +23,336 @@ repositories listed at
|
|||
http://git-blame.blogspot.com/p/git-public-repositories.html
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
[Graduated to 'master']
|
||||
|
||||
* 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
|
||||
* ak/commit-graph-to-slab (2020-06-17) 4 commits
|
||||
(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
|
||||
|
||||
An in-code comment in "git diff" has been updated.
|
||||
A few fields in "struct commit" that do not have to always be
|
||||
present have been moved to commit slabs.
|
||||
|
||||
|
||||
* 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()
|
||||
* 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
|
||||
|
||||
Leakfix.
|
||||
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.
|
||||
|
||||
|
||||
* 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()
|
||||
* 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.)
|
||||
|
||||
Leakfix.
|
||||
CVS/SVN interface have been prepared for SHA-256 transition
|
||||
|
||||
|
||||
* 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
|
||||
* bc/sha-256-part-2 (2020-06-19) 44 commits
|
||||
(merged to 'next' on 2020-06-22 at dc153f366d)
|
||||
+ remote-testgit: adapt for object-format
|
||||
+ bundle: detect hash algorithm when reading refs
|
||||
+ t5300: pass --object-format to git index-pack
|
||||
+ t5704: send object-format capability with SHA-256
|
||||
+ t5703: use object-format serve option
|
||||
+ t5702: offer an object-format capability in the test
|
||||
+ t/helper: initialize the repository for test-sha1-array
|
||||
+ remote-curl: avoid truncating refs with ls-remote
|
||||
+ t1050: pass algorithm to index-pack when outside repo
|
||||
+ builtin/index-pack: add option to specify hash algorithm
|
||||
+ remote-curl: detect algorithm for dumb HTTP by size
|
||||
+ builtin/ls-remote: initialize repository based on fetch
|
||||
+ t5500: make hash independent
|
||||
+ serve: advertise object-format capability for protocol v2
|
||||
+ connect: parse v2 refs with correct hash algorithm
|
||||
+ connect: pass full packet reader when parsing v2 refs
|
||||
+ Documentation/technical: document object-format for protocol v2
|
||||
+ t1302: expect repo format version 1 for SHA-256
|
||||
+ builtin/show-index: provide options to determine hash algo
|
||||
+ t5302: modernize test formatting
|
||||
+ packfile: compute and use the index CRC offset
|
||||
+ t3200: mark assertion with SHA1 prerequisite
|
||||
+ setup: set the_repository's hash algo when checking format
|
||||
+ fetch-pack: parse and advertise the object-format capability
|
||||
+ t5562: pass object-format in synthesized test data
|
||||
+ builtin/clone: initialize hash algorithm properly
|
||||
+ remote-curl: implement object-format extensions
|
||||
+ transport-helper: implement object-format extensions
|
||||
+ docs: update remote helper docs for object-format extensions
|
||||
+ builtin/receive-pack: detect when the server doesn't support our hash
|
||||
+ connect: detect algorithm when fetching refs
|
||||
+ fetch-pack: detect when the server doesn't support our hash
|
||||
+ connect: make parse_feature_value extern
|
||||
+ send-pack: detect when the server doesn't support our hash
|
||||
+ connect: add function to detect supported v1 hash functions
|
||||
+ transport: add a hash algorithm member
|
||||
+ pkt-line: add a member for hash algorithm
|
||||
+ connect: add function to fetch value of a v2 server capability
|
||||
+ connect: add function to parse multiple v1 capability values
|
||||
+ remote: advertise the object-format capability on the server side
|
||||
+ wrapper: add function to compare strings with different NUL termination
|
||||
+ connect: have ref processing code take struct packet_reader
|
||||
+ Documentation: document v1 protocol object-format capability
|
||||
+ t1050: match object ID paths in a hash-insensitive way
|
||||
(this branch is used by bc/sha-256-cvs-svn-updates.)
|
||||
|
||||
A misdesigned strbuf_write_fd() function has been retired.
|
||||
SHA-256 migration work continues.
|
||||
|
||||
|
||||
* 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.)
|
||||
* 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
|
||||
|
||||
"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.
|
||||
Code clean-up.
|
||||
|
||||
|
||||
* xl/upgrade-repo-format (2020-06-05) 4 commits
|
||||
(merged to 'next' on 2020-06-19 at 02bf7a9d8c)
|
||||
+ check_repository_format_gently(): refuse extensions for old repositories
|
||||
+ sparse-checkout: upgrade repository to version 1 when enabling extension
|
||||
+ fetch: allow adding a filter after initial clone
|
||||
+ repository: add a helper function to perform repository format upgrade
|
||||
* dl/test-must-fail-fixes-5 (2020-06-24) 4 commits
|
||||
(merged to 'next' on 2020-06-29 at efe53a7588)
|
||||
+ 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
|
||||
|
||||
Allow runtime upgrade of the repository format version, which needs
|
||||
to be done carefully.
|
||||
The effort to avoid using test_must_fail on non-git command continues.
|
||||
|
||||
There is a rather unpleasant backward compatibility worry with the
|
||||
last step of this series, but it is the right thing to do in the
|
||||
longer term.
|
||||
|
||||
* 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
|
||||
|
||||
"git status" learned to report the status of sparse checkout.
|
||||
|
||||
|
||||
* 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()
|
||||
|
||||
|
||||
* es/worktree-code-cleanup (2020-06-24) 1 commit
|
||||
(merged to 'next' on 2020-06-29 at 91ffd85a31)
|
||||
+ worktree: avoid dead-code in conditional
|
||||
|
||||
Code cleanup.
|
||||
|
||||
|
||||
* jk/fast-export-anonym-alt (2020-06-25) 11 commits
|
||||
(merged to 'next' on 2020-06-29 at 8a8d83e2ca)
|
||||
+ 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
|
||||
|
||||
"git fast-export --anonymize" learned to take customized mapping to
|
||||
allow its users to tweak its output more usable for debugging.
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
* js/default-branch-name (2020-06-30) 10 commits
|
||||
(merged to 'next' on 2020-07-01 at c38d766581)
|
||||
+ contrib: subtree: adjust test to change in fmt-merge-msg
|
||||
(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.<name>.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'.
|
||||
|
||||
|
||||
* js/diff-files-i-t-a-fix-for-difftool (2020-07-01) 2 commits
|
||||
(merged to 'next' on 2020-07-01 at cf5d18635c)
|
||||
+ difftool -d: ensure that intent-to-add files are handled correctly
|
||||
+ diff-files --raw: show correct post-image of intent-to-add files
|
||||
|
||||
"git difftool" has trouble dealing with paths added to the index
|
||||
with the intent-to-add bit.
|
||||
|
||||
|
||||
* 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`
|
||||
|
||||
The documentation and some tests have been adjusted for the recent
|
||||
renaming of "pu" branch to "seen".
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
Docfix.
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
By renumbering object flag bits, "struct object" managed to lose
|
||||
bloated inter-field padding.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* 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()
|
||||
* bw/fail-cloning-into-non-empty (2020-07-06) 1 commit
|
||||
- git clone: don't clone into non-empty directory
|
||||
|
||||
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.
|
||||
"git clone --separate-git-dir=$elsewhere" used to stomp on the
|
||||
contents of the existing directory $elsewhere, which has been
|
||||
taught to fail when $elsewhere is not an empty directory.
|
||||
|
||||
Will merge to 'next'.
|
||||
Expecting a reroll.
|
||||
with improved commit log message.
|
||||
cf. <xmqqv9j08dxo.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* cc/cat-file-usage-update (2020-07-01) 1 commit
|
||||
(merged to 'next' on 2020-07-06 at 270769a009)
|
||||
+ cat-file: add missing [=<format>] to usage/synopsis
|
||||
|
||||
Doc/usage update.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* cc/pretty-contents-size (2020-07-06) 2 commits
|
||||
- ref-filter: add support for %(contents:size)
|
||||
- Documentation: clarify %(contents:XXXX) doc
|
||||
|
||||
"git for-each-ref --format=<>" learned %(contents:size).
|
||||
|
||||
Expecting a reroll.
|
||||
with clarified semantics and tests with various object types
|
||||
cf. <xmqq5zb09v4e.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* ls/mergetool-meld-auto-merge (2020-07-06) 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.
|
||||
|
||||
Expecting a reroll.
|
||||
with final fixes and readability improvements.
|
||||
cf. <xmqqzh8c8eda.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* pb/log-rev-list-doc (2020-07-06) 4 commits
|
||||
- rev-list-description.txt: fix Asciidoc syntax
|
||||
- git-log.txt: include rev-list-description.txt
|
||||
- git-rev-list.txt: move description to separate file
|
||||
- git-log.txt: add links to 'rev-list' and 'diff' docs
|
||||
|
||||
"git help log" has been enhanced by sharing more material from the
|
||||
documentation for the underlying "git rev-list" command.
|
||||
|
||||
Expecting a reroll.
|
||||
with reordering the last one to make it preparatory clean-up.
|
||||
cf. <xmqqimf087pq.fsf@gitster.c.googlers.com>
|
||||
cf. <xmqqeepo87hz.fsf@gitster.c.googlers.com>
|
||||
|
||||
|
||||
* rs/line-log-until (2020-07-06) 1 commit
|
||||
(merged to 'next' on 2020-07-06 at 84d6bc67fa)
|
||||
+ revision: disable min_age optimization with line-log
|
||||
|
||||
"git log -Lx,y:path --before=date" lost track of where the range
|
||||
should be because it didn't take the changes made by the youngest
|
||||
commits that are omitted from the output into account.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ta/wait-on-aliased-commands-upon-signal (2020-07-06) 2 commits
|
||||
- Wait for child on signal death for aliases to externals
|
||||
- Wait for child on signal death for aliases to builtins
|
||||
|
||||
When an aliased command, whose output is piped to a pager by git,
|
||||
gets killed by a signal, the pager got into a funny state, which
|
||||
has been corrected (again).
|
||||
|
||||
Expecting a reroll.
|
||||
with improved log messages.
|
||||
cf. <20200706211403.GB85133@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* tb/upload-pack-filters (2020-07-06) 4 commits
|
||||
- upload-pack.c: introduce 'uploadpack.filter.tree.maxDepth'
|
||||
- upload-pack.c: pass 'struct list_objects_filter_options *'
|
||||
- upload-pack.c: allow banning certain object filter(s)
|
||||
- list_objects_filter_options: introduce 'list_object_filter_config_name'
|
||||
|
||||
The component to respond to "git fetch" request is made more
|
||||
configurable to selectively allow or reject object filtering
|
||||
specification used for partial cloning.
|
||||
|
||||
Waiting for reviews.
|
||||
cf. <cover.1593720075.git.me@ttaylorr.com>
|
||||
|
||||
|
||||
* vs/completion-with-set-u (2020-07-01) 1 commit
|
||||
(merged to 'next' on 2020-07-06 at 72b1eca511)
|
||||
+ completion: nounset mode fixes
|
||||
|
||||
The command line completion support (in contrib/) used to be
|
||||
prepared to work with "set -u" but recent changes got a bit more
|
||||
sloppy. This has been corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
|
@ -139,76 +400,16 @@ repositories listed at
|
|||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* 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
|
||||
* 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()
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/fast-export-anonym-alt (2020-06-25) 11 commits
|
||||
(merged to 'next' on 2020-06-29 at 8a8d83e2ca)
|
||||
+ 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
|
||||
|
||||
"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'.
|
||||
|
||||
|
||||
* js/diff-files-i-t-a-fix-for-difftool (2020-06-25) 2 commits
|
||||
(merged to 'next' on 2020-06-29 at a9fcdabb3b)
|
||||
+ difftool -d: ensure that intent-to-add files are handled correctly
|
||||
+ diff-files --raw: show correct post-image of intent-to-add files
|
||||
|
||||
"git difftool" has trouble dealing with paths added to the index
|
||||
with the intent-to-add bit.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* 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`
|
||||
|
||||
The documentation and some tests have been adjusted for the recent
|
||||
renaming of "pu" branch to "seen".
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
Docfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
Expecting a reroll.
|
||||
cf. <CAHd-oW6A2aBHg80R9kyifvF7thwzam5EYYoN9d2TaBcHJrcKWw@mail.gmail.com>
|
||||
|
||||
|
||||
* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
|
||||
|
|
@ -222,136 +423,34 @@ repositories listed at
|
|||
Needs tests.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
By renumbering object flag bits, "struct object" managed to lose
|
||||
bloated inter-field padding.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/worktree-code-cleanup (2020-06-24) 1 commit
|
||||
(merged to 'next' on 2020-06-29 at 91ffd85a31)
|
||||
+ worktree: avoid dead-code in conditional
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ra/send-email-in-reply-to-from-command-line-wins (2020-06-29) 1 commit
|
||||
- send-email: restore --in-reply-to superseding behavior
|
||||
* ra/send-email-in-reply-to-from-command-line-wins (2020-07-01) 1 commit
|
||||
(merged to 'next' on 2020-07-06 at 3892a1ab88)
|
||||
+ send-email: restore --in-reply-to superseding behavior
|
||||
|
||||
"git send-email --in-reply-to=<msg>" 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).
|
||||
|
||||
Expecting a reroll/redesign.
|
||||
Does not behave sensibly for a multi-patch series.
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
"git status" learned to report the status of sparse checkout.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* 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.
|
||||
|
||||
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; is tangled with hn/reftable.)
|
||||
|
||||
CVS/SVN interface have been prepared for SHA-256 transition
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ds/commit-graph-bloom-updates (2020-06-26) 10 commits
|
||||
- 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: fix logic in get_bloom_filter()
|
||||
- commit-graph: change test to die on parse, not load
|
||||
- commit-graph: place bloom_settings in context
|
||||
* ds/commit-graph-bloom-updates (2020-07-01) 10 commits
|
||||
(merged to 'next' on 2020-07-06 at 177e6b362e)
|
||||
+ 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: fix logic in get_bloom_filter()
|
||||
+ 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.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* 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.<name>.branch
|
||||
+ send-pack/transport-helper: avoid mentioning a particular branch
|
||||
+ fmt-merge-msg: stop treating `master` specially
|
||||
(this branch is used by hn/reftable.)
|
||||
|
||||
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'.
|
||||
|
||||
|
||||
|
|
@ -370,42 +469,17 @@ repositories listed at
|
|||
Waiting for a (hopefully final) review.
|
||||
|
||||
|
||||
* ak/commit-graph-to-slab (2020-06-17) 4 commits
|
||||
(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.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* dl/test-must-fail-fixes-5 (2020-06-24) 4 commits
|
||||
(merged to 'next' on 2020-06-29 at efe53a7588)
|
||||
+ 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.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sg/commit-graph-cleanups (2020-06-08) 10 commits
|
||||
- commit-graph: simplify write_commit_graph_file() #2
|
||||
- commit-graph: simplify write_commit_graph_file() #1
|
||||
- commit-graph: simplify parse_commit_graph() #2
|
||||
- commit-graph: simplify parse_commit_graph() #1
|
||||
- commit-graph: clean up #includes
|
||||
- diff.h: drop diff_tree_oid() & friends' return value
|
||||
- commit-slab: add a function to deep free entries on the slab
|
||||
- commit-graph-format.txt: all multi-byte numbers are in network byte order
|
||||
- commit-graph: fix parsing the Chunk Lookup table
|
||||
- tree-walk.c: don't match submodule entries for 'submod/anything'
|
||||
+ commit-graph: simplify write_commit_graph_file() #2
|
||||
+ commit-graph: simplify write_commit_graph_file() #1
|
||||
+ commit-graph: simplify parse_commit_graph() #2
|
||||
+ commit-graph: simplify parse_commit_graph() #1
|
||||
+ commit-graph: clean up #includes
|
||||
+ diff.h: drop diff_tree_oid() & friends' return value
|
||||
+ commit-slab: add a function to deep free entries on the slab
|
||||
+ commit-graph-format.txt: all multi-byte numbers are in network byte order
|
||||
+ commit-graph: fix parsing the Chunk Lookup table
|
||||
+ tree-walk.c: don't match submodule entries for 'submod/anything'
|
||||
(this branch is used by ds/commit-graph-bloom-updates.)
|
||||
|
||||
The changed-path Bloom filter is improved using ideas from an
|
||||
|
|
@ -455,59 +529,6 @@ repositories listed at
|
|||
cf. <CABPp-BGdEyEeajYZj_rdxp=MyEQdszuyjVTax=hhYj3fOtRQUQ@mail.gmail.com>
|
||||
|
||||
|
||||
* bc/sha-256-part-2 (2020-06-19) 44 commits
|
||||
(merged to 'next' on 2020-06-22 at dc153f366d)
|
||||
+ remote-testgit: adapt for object-format
|
||||
+ bundle: detect hash algorithm when reading refs
|
||||
+ t5300: pass --object-format to git index-pack
|
||||
+ t5704: send object-format capability with SHA-256
|
||||
+ t5703: use object-format serve option
|
||||
+ t5702: offer an object-format capability in the test
|
||||
+ t/helper: initialize the repository for test-sha1-array
|
||||
+ remote-curl: avoid truncating refs with ls-remote
|
||||
+ t1050: pass algorithm to index-pack when outside repo
|
||||
+ builtin/index-pack: add option to specify hash algorithm
|
||||
+ remote-curl: detect algorithm for dumb HTTP by size
|
||||
+ builtin/ls-remote: initialize repository based on fetch
|
||||
+ t5500: make hash independent
|
||||
+ serve: advertise object-format capability for protocol v2
|
||||
+ connect: parse v2 refs with correct hash algorithm
|
||||
+ connect: pass full packet reader when parsing v2 refs
|
||||
+ Documentation/technical: document object-format for protocol v2
|
||||
+ t1302: expect repo format version 1 for SHA-256
|
||||
+ builtin/show-index: provide options to determine hash algo
|
||||
+ t5302: modernize test formatting
|
||||
+ packfile: compute and use the index CRC offset
|
||||
+ t3200: mark assertion with SHA1 prerequisite
|
||||
+ setup: set the_repository's hash algo when checking format
|
||||
+ fetch-pack: parse and advertise the object-format capability
|
||||
+ t5562: pass object-format in synthesized test data
|
||||
+ builtin/clone: initialize hash algorithm properly
|
||||
+ remote-curl: implement object-format extensions
|
||||
+ transport-helper: implement object-format extensions
|
||||
+ docs: update remote helper docs for object-format extensions
|
||||
+ builtin/receive-pack: detect when the server doesn't support our hash
|
||||
+ connect: detect algorithm when fetching refs
|
||||
+ fetch-pack: detect when the server doesn't support our hash
|
||||
+ connect: make parse_feature_value extern
|
||||
+ send-pack: detect when the server doesn't support our hash
|
||||
+ connect: add function to detect supported v1 hash functions
|
||||
+ transport: add a hash algorithm member
|
||||
+ pkt-line: add a member for hash algorithm
|
||||
+ connect: add function to fetch value of a v2 server capability
|
||||
+ connect: add function to parse multiple v1 capability values
|
||||
+ remote: advertise the object-format capability on the server side
|
||||
+ wrapper: add function to compare strings with different NUL termination
|
||||
+ connect: have ref processing code take struct packet_reader
|
||||
+ Documentation: document v1 protocol object-format capability
|
||||
+ t1050: match object ID paths in a hash-insensitive way
|
||||
(this branch is used by bc/sha-256-cvs-svn-updates and hn/reftable.)
|
||||
|
||||
SHA-256 migration work continues.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jx/proc-receive-hook (2020-05-18) 11 commits
|
||||
- doc: add documentation for the proc-receive hook
|
||||
- transport: parse report options for tracking refs
|
||||
|
|
@ -527,36 +548,20 @@ repositories listed at
|
|||
Needs review.
|
||||
|
||||
|
||||
* hn/reftable (2020-06-29) 23 commits
|
||||
- fixup! Reftable support for git-core
|
||||
- Add "test-tool dump-reftable" command.
|
||||
- Add reftable testing infrastructure
|
||||
- git-prompt: prepare for reftable refs backend
|
||||
- vcxproj: adjust for the reftable changes
|
||||
- Add GIT_DEBUG_REFS debugging mechanism
|
||||
- Hookup unittests for the reftable library.
|
||||
- Reftable support for git-core
|
||||
- Add standalone build infrastructure for reftable
|
||||
- Add reftable library
|
||||
- Add .gitattributes for the reftable/ directory
|
||||
- Iterate over the "refs/" namespace in for_each_[raw]ref
|
||||
- Move REF_LOG_ONLY to refs-internal.h
|
||||
- Treat REVERT_HEAD as a pseudo ref
|
||||
- Treat CHERRY_PICK_HEAD as a pseudo ref
|
||||
* hn/reftable (2020-07-06) 4 commits
|
||||
- Treat BISECT_HEAD as a pseudo ref
|
||||
- Make refs_ref_exists public
|
||||
- Write pseudorefs through ref backends.
|
||||
- checkout: add '\n' to reflog message
|
||||
- t3432: use git-reflog to inspect the reflog for HEAD
|
||||
- lib-t6000.sh: write tag using git-update-ref
|
||||
- Merge branch 'bc/sha-256-part-2' into HEAD
|
||||
- Merge branch 'js/default-branch-name' into HEAD
|
||||
(this branch uses bc/sha-256-part-2 and js/default-branch-name; is tangled with bc/sha-256-cvs-svn-updates.)
|
||||
|
||||
A new refs backend "reftable" to replace the traditional
|
||||
combination of packed-refs files and one-file-per-ref loose refs
|
||||
has been implemented and integrated for improved performance and
|
||||
atomicity.
|
||||
Preliminary clean-up of the refs API in preparation for adding a
|
||||
new refs backend "reftable".
|
||||
|
||||
Expecting a reroll.
|
||||
The second one should be dropped, and possibly replaced with a
|
||||
patch that moves message normalization from backends to the more
|
||||
generic layer.
|
||||
cf. <xmqqmu4ca31g.fsf@gitster.c.googlers.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
|
|
|||
Loading…
Reference in New Issue