To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (May 2020, #02; Tue, 5)
-X-master-at: 07d8ea56f2ecb64b75b92264770c0a664231ce17
-X-next-at: 55c56c9c57da646085d27e61a3420043978ab4a1
+Subject: What's cooking in git.git (May 2020, #03; Fri, 8)
+X-master-at: b994622632154fc3b17fb40a38819ad954a5fb88
+X-next-at: 0e0b3e54bef85529846ce55fa34a67746509a2cd
-What's cooking in git.git (May 2020, #02; Tue, 5)
+What's cooking in git.git (May 2020, #03; Fri, 8)
--------------------------------------------------
Here are the topics that have been cooking. 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.
+I have been a bit more aggressive than usual in merging topics down
+to 'next' and 'master' this week, in preparation for -rc0, scheduled
+on the 14th. We may need to apply last-minute fixes to some of
+these topics but let's hope that we can keep them to the minimum.
+
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* bc/wildcard-credential (2020-04-27) 1 commit
- (merged to 'next' on 2020-04-28 at 1a0d6b91dc)
- + credential: fix matching URLs with multiple levels in path
+* ah/userdiff-markdown (2020-05-02) 1 commit
+ (merged to 'next' on 2020-05-05 at b8e64b75d0)
+ + userdiff: support Markdown
+
+ The userdiff patterns for Markdown documents have been added.
+
- Update the parser used for credential.<URL>.<variable>
- configuration, to handle <URL>s with '/' in them correctly.
+* bc/doc-credential-helper-value (2020-05-06) 1 commit
+ (merged to 'next' on 2020-05-07 at de685cea7b)
+ + docs: document credential.helper allowed values
+ Doc update.
+
+
+* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit
+ (merged to 'next' on 2020-05-06 at 5cccb0e1a8)
+ + builtin/receive-pack: avoid generic function name hmac()
+
+ The <stdlib.h> header on NetBSD brings in its own definition of
+ hmac() function (eek), which conflicts with our own and unrelated
+ function with the same name. Our function has been renamed to work
+ around the issue.
-* dd/iso-8601-updates (2020-04-24) 4 commits
- (merged to 'next' on 2020-04-28 at 18fba39171)
- + date.c: allow compact version of ISO-8601 datetime
- + date.c: skip fractional second part of ISO-8601
- + date.c: validate and set time in a helper function
- + date.c: s/is_date/set_date/
- The approxidate parser learns to parse seconds with fraction.
+* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits
+ (merged to 'next' on 2020-05-05 at 5b919ec5d6)
+ + credential-store: ignore bogus lines from store file
+ + credential-store: document the file format a bit more
+ With the recent tightening of the code that is used to parse
+ various parts of a URL for use in the credential subsystem, a
+ hand-edited credential-store file causes the credential helper to
+ die, which is a bit too harsh to the users. Demote the error
+ behaviour to just ignore and keep using well-formed lines instead.
-* dd/mailinfo-with-nul (2020-04-22) 3 commits
- (merged to 'next' on 2020-04-28 at b1d3e40d49)
- + mailinfo: disallow NUL character in mail's header
- + mailinfo.c: avoid strlen on strings that can contains NUL
- + t4254: merge 2 steps of a single test
- Tighten "git mailinfo" to notice and error out when decoded result
- contains NUL in it.
+* cb/t0000-use-the-configured-shell (2020-05-07) 1 commit
+ (merged to 'next' on 2020-05-07 at c5db4882c4)
+ + t/t0000-basic: make sure subtests also use TEST_SHELL_PATH
+ The basic test did not honor $TEST_SHELL_PATH setting, which has
+ been corrected.
-* dd/sparse-fixes (2020-04-27) 4 commits
- (merged to 'next' on 2020-04-28 at d809f916ee)
- + progress.c: silence cgcc suggestion about internal linkage
- + graph.c: limit linkage of internal variable
- + compat/regex: move stdlib.h up in inclusion chain
- + test-parse-pathspec-file.c: s/0/NULL/ for pointer type
- Compilation fix.
+* cb/test-bash-lineno-fix (2020-05-07) 1 commit
+ (merged to 'next' on 2020-05-07 at 8c07e52d2f)
+ + t/test_lib: avoid naked bash arrays in file_lineno
+ Recent change to show files and line numbers of a breakage during
+ test (only available when running the tests with bash) were hurting
+ other shells with syntax errors, which has been corrected.
-* dl/opt-callback-cleanup (2020-04-28) 1 commit
- (merged to 'next' on 2020-04-28 at aa773e183a)
- + Use OPT_CALLBACK and OPT_CALLBACK_F
- Code cleanup.
+* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit
+ (merged to 'next' on 2020-05-06 at 8b570b7722)
+ + Doc: reference the "stash list" in autostash docs
+ Doc update.
-* dl/push-recurse-submodules-fix (2020-04-28) 1 commit
- (merged to 'next' on 2020-04-28 at c2cd20ef9e)
- + push: unset PARSE_OPT_OPTARG for --recurse-submodules
- Code cleanup.
+* dl/switch-c-option-in-error-message (2020-04-30) 1 commit
+ (merged to 'next' on 2020-05-05 at 472db48735)
+ + switch: fix errors and comments related to -c and -C
+
+ In error messages that "git switch" mentions its option to create a
+ new branch, "-b/-B" options were shown, where "-c/-C" options
+ should be, which has been corrected.
+
+
+* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit
+ (merged to 'next' on 2020-05-06 at de7b38aee5)
+ + sparse-checkout: stop blocking empty workdirs
+
+ The sparse-checkout patterns have been forbidden from excluding all
+ paths, leaving an empty working tree, for a long time. This
+ limitation has been lifted.
+
+
+* es/restore-staged-from-head-by-default (2020-05-05) 1 commit
+ (merged to 'next' on 2020-05-06 at c4abf9b5df)
+ + restore: default to HEAD when combining --staged and --worktree
+
+ "git restore --staged --worktree" now defaults to take the contents
+ out of "HEAD", instead of erring out.
+
+
+* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit
+ (merged to 'next' on 2020-05-06 at 2325148249)
+ + CodingGuidelines: drop arithmetic expansion advice to use "$x"
+
+ The coding guideline for shell scripts instructed to refer to a
+ variable with dollar-sign inside arithmetic expansion to work
+ around a bug in old versions of dash, which is a thing of the past.
+ Now we are not forbidden from writing $((var+1)).
+
+
+* jk/credential-sample-update (2020-05-01) 2 commits
+ (merged to 'next' on 2020-05-06 at c72ed30ee5)
+ + gitcredentials(7): make shell-snippet example more realistic
+ + gitcredentials(7): clarify quoting of helper examples
+
+ The samples in the credential documentation has been updated to
+ make it clear that we depict what would appear in the .git/config
+ file, by adding appropriate quotes as needed..
-* dl/test-must-fail-fixes-4 (2020-04-20) 7 commits
- (merged to 'next' on 2020-04-28 at 6f4804aa09)
- + t9819: don't use test_must_fail with p4
- + t9164: use test_must_fail only on git commands
- + t9160: use test_path_is_missing()
- + t9141: use test_path_is_missing()
- + t7508: don't use `test_must_fail test_cmp`
- + t7408: replace incorrect uses of test_must_fail
- + t6030: use test_path_is_missing()
+* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits
+ (merged to 'next' on 2020-05-06 at f4e4ca3cb4)
+ + ref-filter: apply fallback refname sort only after all user sorts
+ + ref-filter: apply --ignore-case to all sorting keys
- Test clean-up.
+ "git branch" and other "for-each-ref" variants accepted multiple
+ --sort=<key> options in the increasing order of precedence, but it
+ had a few breakages around "--ignore-case" handling, and tie-breaking
+ with the refname, which have been fixed.
-* ds/blame-on-bloom (2020-04-23) 6 commits
- (merged to 'next' on 2020-04-28 at 6152eb2eb3)
- + test-bloom: check that we have expected arguments
- + test-bloom: fix some whitespace issues
- + blame: drop unused parameter from maybe_changed_path
- (merged to 'next' on 2020-04-22 at dc4f24e54b)
- + blame: use changed-path Bloom filters
- + tests: write commit-graph with Bloom filters
- + revision: complicated pathspecs disable filters
- (this branch is used by ds/line-log-on-bloom; uses gs/commit-graph-path-filter.)
+* jt/commit-graph-plug-memleak (2020-05-04) 1 commit
+ (merged to 'next' on 2020-05-06 at 0f80a2b561)
+ + commit-graph: avoid memory leaks
- "git blame" learns to take advantage of the "changed-paths" Bloom
- filter stored in the commit-graph file.
+ Fix a leak noticed by fuzzer.
+--------------------------------------------------
+[New Topics]
-* ds/build-homebrew-gettext-fix (2020-04-27) 1 commit
- (merged to 'next' on 2020-04-28 at 70c6eca470)
- + macOS/brew: let the build find gettext headers/libraries/msgfmt
+* ss/faq-ignore (2020-05-06) 1 commit
+ (merged to 'next' on 2020-05-07 at 6273caaf77)
+ + gitfaq: files in .gitignore are tracked
- Recent update to Homebrew used by macOS folks breaks build by
- moving gettext library and necessary headers.
+ Random bits of FAQ.
+ Will merge to 'master'.
-* ds/multi-pack-index (2020-04-24) 1 commit
- (merged to 'next' on 2020-04-28 at b8f9691cbc)
- + multi-pack-index: close file descriptor after mmap
- The multi-pack-index left mmapped file descriptors open when it
- does not have to.
+* ss/faq-fetch-pull (2020-05-06) 1 commit
+ (merged to 'next' on 2020-05-07 at d57224374e)
+ + gitfaq: fetching and pulling a repository
+ Random bits of FAQ.
-* eb/gitweb-more-trailers (2020-04-24) 1 commit
- (merged to 'next' on 2020-04-28 at 7b16ac0810)
- + gitweb: Recognize *-to and Closes/Fixes trailers
+ Will merge to 'master'.
- Gitweb updates.
+* jc/auto-gc-quiet (2020-05-07) 2 commits
+ (merged to 'next' on 2020-05-07 at 6cc69513c3)
+ + auto-gc: pass --quiet down from am, commit, merge and rebase
+ + auto-gc: extract a reusable helper from "git fetch"
-* en/rebase-root-and-fork-point-are-incompatible (2020-04-27) 1 commit
- (merged to 'next' on 2020-04-28 at 8ea4882905)
- + rebase: display an error if --root and --fork-point are both provided
+ Teach "am", "commit", "merge" and "rebase", when they are run with
+ the "--quiet" option, to pass "--quiet" down to "gc --auto".
- Incompatible options "--root" and "--fork-point" of "git rebase"
- have been marked and documented as being incompatible.
+ Will merge to 'master'.
-* es/bugreport (2020-04-27) 6 commits
- (merged to 'next' on 2020-04-28 at fdfd36a5d7)
- + bugreport: drop extraneous includes
- (merged to 'next' on 2020-04-22 at f5a2ab988e)
- + bugreport: add compiler info
- + bugreport: add uname info
- + bugreport: gather git version and build info
- + bugreport: add tool to generate debugging info
- + help: move list_config_help to builtin/help
- (this branch is used by es/bugreport-with-hooks.)
+* jt/t5500-unflake (2020-05-06) 1 commit
+ - t5500: count objects through stderr, not trace
- The "bugreport" tool.
+ Test fix for a topic already in 'master' and meant for 'maint'.
+ Expecting an update to clarify the log message.
+ Otherwise the change itself looked good.
-* gs/commit-graph-path-filter (2020-04-09) 16 commits
- (merged to 'next' on 2020-04-22 at 34b35f43bd)
- + bloom: ignore renames when computing changed paths
- + commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag
- + t4216: add end to end tests for git log with Bloom filters
- + revision.c: add trace2 stats around Bloom filter usage
- + revision.c: use Bloom filters to speed up path based revision walks
- + commit-graph: add --changed-paths option to write subcommand
- + commit-graph: reuse existing Bloom filters during write
- + commit-graph: write Bloom filters to commit graph file
- + commit-graph: examine commits by generation number
- + commit-graph: examine changed-path objects in pack order
- + commit-graph: compute Bloom filters for changed paths
- + diff: halt tree-diff early after max_changes
- + bloom.c: core Bloom filter implementation for changed paths.
- + bloom.c: introduce core Bloom filter constructs
- + bloom.c: add the murmur3 hash implementation
- + commit-graph: define and use MAX_NUM_CHUNKS
- (this branch is used by ds/blame-on-bloom and ds/line-log-on-bloom.)
- Introduce an extension to the commit-graph to make it efficient to
- check for the paths that were modified at each commit using Bloom
- filters.
+* jk/ci-only-on-selected-branches (2020-05-07) 1 commit
+ (merged to 'next' on 2020-05-07 at f3227dd3d3)
+ + ci: allow per-branch config for GitHub Actions
+ Instead of always building all branches at GitHub via Actions,
+ users can specify which branches to build.
-* jk/build-with-right-curl (2020-04-05) 3 commits
- (merged to 'next' on 2020-04-28 at 1718c25b44)
- + Makefile: avoid running curl-config unnecessarily
- + Makefile: use curl-config --cflags
- + Makefile: avoid running curl-config multiple times
+ Will merge to 'master'.
- The build procedure did not use the libcurl library and its include
- files correctly for a custom-built installation.
- cf. <20200428033611.GB2369457@coredump.intra.peff.net>
+* cc/upload-pack-v2-fetch-fix (2020-05-08) 1 commit
+ (merged to 'next' on 2020-05-08 at d26b87d06d)
+ + upload-pack: clear filter_options for each v2 fetch command
-* jk/test-fail-prereqs-fix (2020-04-28) 1 commit
- (merged to 'next' on 2020-04-28 at 75787711c0)
- + t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests
+ Serving a "git fetch" client over "git://" and "ssh://" protocols
+ using the on-wire protocol version 2 was buggy on the server end
+ when the client needs to make a follow-up request to
+ e.g. auto-follow tags.
- Test update.
+ Will merge to 'master'.
-* js/anonymise-push-url-in-errors (2020-04-28) 1 commit
- (merged to 'next' on 2020-04-28 at 49539cf116)
- + push: anonymize URLs in error messages and warnings
+* cw/bisect-replay-with-dos (2020-05-08) 1 commit
+ - bisect: allow CRLF line endings in "git bisect replay" input
- Error and verbose trace messages from "git push" did not redact
- credential material embedded in URLs.
+ "git bisect replay" had trouble with input files when they used
+ CRLF line ending, which has been corrected.
+ Will merge to 'next'.
-* js/partial-urlmatch (2020-04-29) 3 commits
- (merged to 'next' on 2020-05-01 at e7017fcfd1)
- + Sync with js/partial-urlmatch-2.17
- + credential: handle `credential.<partial-URL>.<key>` again
- + credential: optionally allow partial URLs in credential_from_url_gently()
- (this branch uses js/partial-urlmatch-2.17.)
- The same as js/partial-urlmatch-2.17, built on more recent codebase
- to avoid unnecessary merge conflicts.
+* dd/bloom-sparse-fix (2020-05-07) 1 commit
+ (merged to 'next' on 2020-05-08 at 1067403c01)
+ + bloom: fix `make sparse` warning
+ Code clean-up.
-* js/partial-urlmatch-2.17 (2020-04-29) 3 commits
- (merged to 'next' on 2020-05-01 at 7c69571f89)
- + credential: handle `credential.<partial-URL>.<key>` again
- + credential: optionally allow partial URLs in credential_from_url_gently()
- + credential: fix grammar
- (this branch is used by js/partial-urlmatch.)
+ Will merge to 'master'.
- Recent updates broke parsing of "credential.<url>.<key>" where
- <url> is not a full URL (e.g. [credential "https://"] helper = ...)
- stopped working, which has been corrected.
+* ds/sparse-updates-oob-access-fix (2020-05-08) 1 commit
+ (merged to 'next' on 2020-05-08 at fd007758ea)
+ + unpack-trees: avoid array out-of-bounds error
-* jt/v2-fetch-nego-fix (2020-04-28) 3 commits
- (merged to 'next' on 2020-04-28 at c6f9ebf2f7)
- + fetch-pack: in protocol v2, reset in_vain upon ACK
- + fetch-pack: in protocol v2, in_vain only after ACK
- + fetch-pack: return enum from process_acks()
+ The code to skip unmerged paths in the index when sparse checkout
+ is in use would have made out-of-bound access of the in-core index
+ when the last path was unmerged, which has been corrected.
- The upload-pack protocol v2 gave up too early before finding a
- common ancestor, resulting in a wasteful fetch from a fork of a
- project. This has been corrected to match the behaviour of v0
- protocol.
+ Will merge to 'master'.
-* mt/doc-worktree-ref (2020-04-24) 1 commit
- (merged to 'next' on 2020-04-28 at d96c05cb0a)
- + config doc: fix reference to config.worktree info
+* hn/refs-cleanup (2020-05-08) 4 commits
+ - t: use update-ref and show-ref to reading/writing refs
+ - refs: document how ref_iterator_advance_fn should handle symrefs
+ - Iterate over the "refs/" namespace in for_each_[raw]ref
+ - refs.h: clarify reflog iteration order
+ (this branch is used by hn/reftable.)
- Docfix.
+ Preliminary clean-ups around refs API.
+ Needs minor rework but otherwise looks ready.
+ I splitted these out of the hn/reftable topic, hoping that these
+ should be easier to polish and merge quickly than the rest of the
+ series.
-* tb/commit-graph-fd-exhaustion-fix (2020-04-24) 4 commits
- (merged to 'next' on 2020-04-28 at 6d5fd6bc49)
- + commit-graph: close descriptors after mmap
- + commit-graph.c: gracefully handle file descriptor exhaustion
- + t/test-lib.sh: make ULIMIT_FILE_DESCRIPTORS available to tests
- + commit-graph.c: don't use discarded graph_name in error
- (this branch is tangled with tb/commit-graph-split-strategy.)
- The commit-graph code exhausted file descriptors easily when it
- does not have to.
+* jc/codingstyle-compare-with-null (2020-05-08) 1 commit
+ - CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL
+ Doc update.
-* tb/commit-graph-perm-bits (2020-04-29) 5 commits
- (merged to 'next' on 2020-04-29 at 66a87c1fbc)
- + commit-graph.c: make 'commit-graph-chain's read-only
- + commit-graph.c: ensure graph layers respect core.sharedRepository
- + commit-graph.c: write non-split graphs as read-only
- + lockfile.c: introduce 'hold_lock_file_for_update_mode'
- + tempfile.c: introduce 'create_tempfile_mode'
+ Will merge to 'next'.
- Some of the files commit-graph subsystem keeps on disk did not
- correctly honor the core.sharedRepository settings and some were
- left read-write.
+* ss/submodule-set-url-in-c (2020-05-08) 1 commit
+ (merged to 'next' on 2020-05-08 at 93e390eb33)
+ + submodule: port subcommand 'set-url' from shell to C
-* tb/commit-graph-split-strategy (2020-04-29) 8 commits
- (merged to 'next' on 2020-04-29 at 99fa922569)
- + Revert "commit-graph.c: introduce '--[no-]check-oids'"
- + commit-graph.c: introduce '--[no-]check-oids'
- + commit-graph.h: replace 'commit_hex' with 'commits'
- + oidset: introduce 'oidset_size'
- + builtin/commit-graph.c: introduce split strategy 'replace'
- + builtin/commit-graph.c: introduce split strategy 'no-merge'
- + builtin/commit-graph.c: support for '--split[=<strategy>]'
- + t/helper/test-read-graph.c: support commit-graph chains
- (this branch is tangled with tb/commit-graph-fd-exhaustion-fix.)
+ Rewriting various parts of "git submodule" in C continues.
- "git commit-graph write" learned different ways to write out split
- files.
+ Will merge to 'master'.
+--------------------------------------------------
+[Stalled]
-* tb/reset-shallow (2020-04-24) 2 commits
- (merged to 'next' on 2020-04-28 at 9510639ae8)
- + shallow.c: use '{commit,rollback}_shallow_file'
- + t5537: use test_write_lines and indented heredocs for readability
- (this branch is used by tb/shallow-cleanup.)
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
+ - zlib.c: use size_t for size
- Fix in-core inconsistency after fetching into a shallow repository
- that broke the code to write out commit-graph.
+ 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".
--------------------------------------------------
-[New Topics]
+[Cooking]
* ds/line-log-on-bloom (2020-05-01) 12 commits
- line-log: integrate with changed-path Bloom filters
cf. <4b7e5f51-9fdb-45ac-123e-2589087afa48@gmail.com>
-* es/restore-staged-from-head-by-default (2020-05-05) 1 commit
- - restore: default to HEAD when combining --staged and --worktree
-
- "git restore --staged --worktree" now defaults to take the contents
- out of "HEAD", instead of erroring out.
-
- Will merge to 'next'.
-
-
-* jk/credential-sample-update (2020-05-01) 2 commits
- - gitcredentials(7): make shell-snippet example more realistic
- - gitcredentials(7): clarify quoting of helper examples
-
- The samples in the credential documentation has been updated to
- make it clear that we depict what would appear in the .git/config
- file, by adding appropriate quotes as needed..
-
- Will merge to 'next'.
-
-
-* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits
- - ref-filter: apply fallback refname sort only after all user sorts
- - ref-filter: apply --ignore-case to all sorting keys
-
- "git branch" and other "for-each-ref" variants accepted multiple
- --sort=<key> options in the increasing order of precedence, but it
- had a few breakages around "--ignore-case" handling, and tiebreaking
- with the refname, which have been fixed.
-
- Will merge to 'next'.
-
-
-* js/rebase-autosquash-double-fixup-fix (2020-05-04) 1 commit
+* js/rebase-autosquash-double-fixup-fix (2020-05-05) 1 commit
- rebase --autosquash: fix a potential segfault
"rebase -i" segfaulted when rearranging a sequence that has a
fix-up that applies another fix-up (which may or may not be a
fix-up of yet another step).
- Under review.
- cf. <pull.625.git.1588624804554.gitgitgadget@gmail.com>
+ Expecting a bit more explanation in the log message.
-* jt/commit-graph-plug-memleak (2020-05-04) 1 commit
- - commit-graph: avoid memory leaks
-
- Fix a leak noticed by fuzzer.
-
- Will merge to 'next'.
-
-
-* cb/credential-doc-fixes (2020-05-04) 4 commits
- - credential: document protocol updates
- - credential: update gitcredentials documentation
- - credential: correct order of parameters for credential_match
- - credential: update description for credential_from_url_gently
+* cb/credential-doc-fixes (2020-05-07) 4 commits
+ (merged to 'next' on 2020-05-07 at 993b36071e)
+ + credential: document protocol updates
+ + credential: update gitcredentials documentation
+ + credential: correct order of parameters for credential_match
+ + credential: update description for credential_from_url_gently
Minor in-code comments and documentation updates around credential
API.
- Needs review.
- cf. <20200505013908.4596-1-carenas@gmail.com>
-
-
-* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit
- - sparse-checkout: stop blocking empty workdirs
-
- The sparse-checkout patterns have been forbidden from excluding all
- paths, leaving an empty working tree, for a long time. This
- limitation has been lifted.
-
- Will merge to 'next'.
-
-
-* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit
- - CodingGuidelines: drop arithmetic expansion advice to use "$x"
-
- The coding guideline for shell scripts instructed to refer to a
- variable with dollar-sign inside airthmetic expansion to work
- around a bug in old versions of dash, which is a thing of the past.
- Now we are not forbidden from writing $((var+1)).
-
- Will merge to 'next'.
+ Will merge to 'master'.
* tb/bitmap-walk-with-tree-zero-filter (2020-05-04) 4 commits
- - pack-bitmap: pass object filter to fill-in traversal
- - pack-bitmap.c: support 'tree:0' filtering
- - pack-bitmap.c: make object filtering functions generic
- - list-objects-filter: treat NULL filter_options as "disabled"
+ (merged to 'next' on 2020-05-06 at fbb3fbbb85)
+ + pack-bitmap: pass object filter to fill-in traversal
+ + pack-bitmap.c: support 'tree:0' filtering
+ + pack-bitmap.c: make object filtering functions generic
+ + list-objects-filter: treat NULL filter_options as "disabled"
The object walk with object filter "--filter=tree:0" can now take
advantage of the pack bitmap when available.
- Will merge to 'next'.
+ Will merge to 'master'.
-* tb/commit-graph-no-check-oids (2020-05-04) 8 commits
+* tb/commit-graph-no-check-oids (2020-05-05) 8 commits
- commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
- t5318: reorder test below 'graph_read_expect'
- commit-graph.c: simplify 'fill_oids_from_commits'
Clean-up the commit-graph codepath.
- Expecting a reroll
- cf. <20200505161649.GG69300@syl.local>
-
-
-* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit
- - builtin/receive-pack: avoid generic function name hmac()
-
- The <stdlib.h> header on NetBSD brings in its own definition of
- hmac() function (eek), which conflicts with our own and unrelated
- function with the same name. Our function has been renamed to work
- around the issue.
-
- Will merge to 'next'.
-
-
-* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit
- - Doc: reference the "stash list" in autostash docs
-
- Doc update.
-
- Will merge to 'next'.
+ Expecting a reroll.
+ cf. <20200507204204.GF29683@coredump.intra.peff.net>
+ cf. <20200507200305.GB29683@coredump.intra.peff.net>
* dl/test-must-fail-fixes-5 (2020-05-05) 4 commits
cf. <cover.1588162842.git.liu.denton@gmail.com>
-* dd/ci-only-on-selective-branches (2020-05-05) 2 commits
- - CI: limit GitHub Actions to designated branches
- - SubmittingPatches: advertise GitHub Actions CI
-
- Instead of always building all branches of all forks of our project
- at GitHub via GitHub Actions, only build when branches with known
- and specific names are updated, and also a pull request.
-
- Expecting an update.
- cf. <cover.1588695295.git.congdanhqx@gmail.com>
- The description talks too much about helping (or not getting in the
- way of) the current maintainer, but the focus should instead be
- general contributors.
-
---------------------------------------------------
-[Stalled]
-
-* 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]
-
-* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits
- (merged to 'next' on 2020-05-05 at 5b919ec5d6)
- + credential-store: ignore bogus lines from store file
- + credential-store: document the file format a bit more
-
- With the recent tightening of the code that is used to parse
- various parts of a URL for use in the credential subsystem, a
- hand-edited credential-store file causes the credential helper to
- die, which is a bit too harsh to the users. Demote the error
- behaviour to only warn and keep using well-formed lines instead.
-
- Will merge to 'master'.
-
-
-* dl/switch-c-option-in-error-message (2020-04-30) 1 commit
- (merged to 'next' on 2020-05-05 at 472db48735)
- + switch: fix errors and comments related to -c and -C
-
- In error messages that "git switch" mentions its option to create a
- new branch, "-b/-B" options were shown, where "-c/-C" options
- should be, which has been corrected.
-
- Will merge to 'master'.
-
-
-* es/bugreport-with-hooks (2020-04-30) 2 commits
- - SQUASH???
+* es/bugreport-with-hooks (2020-05-07) 1 commit
- bugreport: collect list of populated hooks
"git bugreport" learned to report enabled hooks in the repository.
Will merge to 'master'.
-* ah/userdiff-markdown (2020-05-02) 1 commit
- (merged to 'next' on 2020-05-05 at b8e64b75d0)
- + userdiff: support Markdown
-
- The userdiff patterns for Markdown documents have been added.
-
- Will merge to 'master'.
-
-
* mr/bisect-in-c-2 (2020-04-23) 12 commits
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--write-terms` subcommand
Needs review.
-* jx/proc-receive-hook (2020-05-05) 7 commits
+* jx/proc-receive-hook (2020-05-07) 7 commits
- doc: add documentation for the proc-receive hook
- receive-pack: new config receive.procReceiveRefs
- refs.c: refactor to reuse ref_is_hidden()
Needs review.
-* hn/reftable (2020-05-04) 12 commits
- - t: use update-ref and show-ref to reading/writing refs
+* hn/reftable (2020-05-08) 8 commits
- Add some reftable testing infrastructure
- vcxproj: adjust for the reftable changes
- Reftable support for git-core
- reftable: define version 2 of the spec to accomodate SHA256
- reftable: file format documentation
- Add .gitattributes for the reftable/ directory
- - refs: document how ref_iterator_advance_fn should handle symrefs
- - Iterate over the "refs/" namespace in for_each_[raw]ref
- - refs.h: clarify reflog iteration order
+ (this branch uses hn/refs-cleanup.)
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.
- At v11.
+ Needs review.
--------------------------------------------------
[Discarded]
them mark the commits with an embedded "[skip ci]" string.
Superseded by dd/ci-only-on-selective-branches topic.
+
+
+* dd/ci-only-on-selective-branches (2020-05-05) 2 commits
+ - CI: limit GitHub Actions to designated branches
+ - SubmittingPatches: advertise GitHub Actions CI
+
+ Instead of always building all branches of all forks of our project
+ at GitHub via GitHub Actions, only build when branches with known
+ and specific names are updated, and also a pull request.
+
+ Superseded by jk/ci-only-on-selected-branches
projects / thirdparty / git.git / commitdiff
