What's cooking in git.git (Apr 2023, #06; Thu, 20)
Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity.
Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ar/t2024-checkout-output-fix (2023-04-10) 1 commit (merged to 'next' on 2023-04-13 at a35a043d6c)
+ t2024: fix loose/strict local base branch DWIM test
Test fix.
source: <[email protected]>
* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit (merged to 'next' on 2023-04-13 at fff15efe05)
+ clone: error specifically with --local and symlinked objects
"git clone --local" stops copying from an original repository that has symbolic links inside its $GIT_DIR; an error message when that happens has been updated.
source: <[email protected]>
* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit (merged to 'next' on 2023-04-13 at ad62b4545a)
+ get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
Code clean-up to replace a hardcoded constant with a CPP macro.
source: <[email protected]>
* rs/remove-approxidate-relative (2023-04-10) 1 commit (merged to 'next' on 2023-04-13 at bd7df5f98c)
+ date: remove approxidate_relative()
The approxidate() API has been simplified by losing an extra function that did the same thing as another one.
source: <[email protected]>
* rs/userdiff-multibyte-regex (2023-04-07) 1 commit (merged to 'next' on 2023-04-13 at 348908c03c)
+ userdiff: support regexec(3) with multi-byte support
The userdiff regexp patterns for various filetypes that are built into the system have been updated to avoid triggering regexp errors from UTF-8 aware regex engines.
source: <[email protected]>
--------------------------------------------------
[New Topics]
* ar/config-count-tests-updates (2023-04-18) 4 commits
- SQUASH???
- t1300: add tests for missing keys
- t1300: check stderr for "ignores pairs" tests
- t1300: drop duplicate test
Test updates.
Expecting a reroll.
source: <[email protected]>
* en/header-split-cache-h-part-2 (2023-04-18) 23 commits
- reftable: ensure git-compat-util.h is the first (indirect) include
- diff.h: reduce unnecessary includes
- object-store.h: reduce unnecessary includes
- commit.h: reduce unnecessary includes
- fsmonitor: reduce includes of cache.h
- cache.h: remove unnecessary headers
- treewide: remove cache.h inclusion due to previous changes
- cache,tree: move basic name compare functions from read-cache to tree
- cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
- hash.h, repository.h: reverse the order of these dependencies
- tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
- dir.h: move DTYPE defines from cache.h
- versioncmp.h: move declarations for versioncmp.c functions from cache.h
- ws.h: move declarations for ws.c functions from cache.h
- match-trees.h: move declarations for match-trees.c functions from cache.h
- pkt-line.h: move declarations for pkt-line.c functions from cache.h
- base85.h: move declarations for base85.c functions from cache.h
- copy.h: move declarations for copy.c functions from cache.h
- server-info.h: move declarations for server-info.c functions from cache.h
- packfile.h: move pack_window and pack_entry from cache.h
- symlinks.h: move declarations for symlinks.c functions from cache.h
- treewide: be explicit about dependence on strbuf.h
- Merge branch 'en/header-split-cache-h' into en/header-split-cache-h-part-2 (this branch uses en/header-split-cache-h.)
More header clean-up.
Will merge to 'next'?
source: <[email protected]>
* fc/doc-checkout-markup-updates (2023-04-18) 2 commits (merged to 'next' on 2023-04-20 at 62782d75c4)
+ doc: git-checkout: reorganize examples
+ doc: git-checkout: trivial callout cleanup
Doc mark-up update.
Will merge to 'master'.
source: <[email protected]>
* jk/gpg-trust-level-fix (2023-04-19) 1 commit
- gpg-interface: set trust level of missing key to "undefined"
The "%GT" placeholder for the "--format" option of "git log" and friends caused BUG() to trigger on a commit signed with an unknown key, which has been corrected.
Will merge to 'next'.
source: <[email protected]>
* ps/fetch-output-format (2023-04-19) 8 commits
- fetch: introduce machine-parseable "porcelain" output format
- fetch: introduce new --output-format option
- fetch: move option related variables into main function
- fetch: move display format parsing into main function
- fetch: introduce display_format enum
- fetch: fix missing from-reference when fetching HEAD:foo
- fetch: add a test to exercise invalid output formats
- fetch: split out tests for output format
"git fetch" learned the "--output-format" option that emits what it did in a machine-parseable format.
Needs review.
source: <[email protected]>
* en/ort-finalize-after-0-merges-fix (2023-04-20) 2 commits
- SQUASH??? futureproofing suggestion by Derrick
- merge-ort: fix calling merge_finalize() with no intermediate merge
source: <[email protected]>
* ma/gittutorial-fixes (2023-04-20) 2 commits
- gittutorial: wrap literal examples in backticks
- gittutorial: drop early mention of origin
source: <[email protected]>
* sg/retire-unused-cocci (2023-04-20) 1 commit
- cocci: remove 'unused.cocci'
source: <[email protected]>
--------------------------------------------------
[Stalled]
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out bitmap_index_seek_commit()
- pack-bitmap.c: use bitmap_index_seek() where possible
- pack-bitmap.c: factor out manual map_pos manipulation
- pack-bitmap.c: drop unnecessary 'inline's
- pack-bitmap.c: hide bitmap internals in read_be32()
- pack-bitmap.c: hide bitmap internals in read_u8()
Clean-up the pack-bitmap codepath.
Kicked back to 'seen' out of 'next'.
There is a BUG() on data errors that needs to be fixed.
source: <[email protected]>
* mh/use-wincred-from-system (2023-03-27) 1 commit
- credential/wincred: include wincred.h
Code clean-up.
May want to discard.
Area maintainer is fairly negative.
cf. <[email protected]>
source: <[email protected]>
* cb/checkout-same-branch-twice (2023-03-22) 2 commits
- SQUASH??? the test marked to expect failure passes from day one
- checkout/switch: disallow checking out same branch in multiple worktrees
"git checkout -B $branch" failed to protect against checking out a branch that is checked out elsewhere, unlike "git branch -f" did.
Expecting a hopefully minor and final reroll.
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
source: <[email protected]>
* ob/revert-of-revert (2023-03-28) 1 commit
- sequencer: call a revert of a revert "reapply"
Instead of "Revert "Revert "original"", give "Replay "original"" as the title for a revert of a revert.
Needs more polishing: docs, tests, transitions.
source: <[email protected]>
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
In an advice message after failed non-ff pull, we used to suggest setting pull.rebase=true, but these days pull.rebase=merges may be more inline with the original spirit of "rebuild your side on top of theirs".
May want to discard.
This is too much of a departure from the existing practice. cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com> cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
source: <[email protected]>
* tl/notes-separator (2023-03-28) 4 commits
. notes.c: don't do stripespace when parse file arg . notes.c: introduce '--separator=<paragraph-break>' option . notes.c: use designated initializers for clarity . notes.c: cleanup 'strbuf_grow' call in 'append_edit'
'git notes append' was taught '--separator' to specify string to insert between paragraphs.
Seems to break CI.
cf. <[email protected]>
source: <[email protected]>
* ab/tag-object-type-errors (2022-11-22) 5 commits
- tag: don't emit potentially incorrect "object is a X, not a Y"
- tag: don't misreport type of tagged objects in errors
- object tests: add test for unexpected objects in tags
- object-file.c: free the "t.tag" in check_tag()
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
Hardening checks around mismatched object types when one of those objects is a tag.
Expecting a reroll.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses
Allow summary results from tests to be written to t/test-results directory even when a test harness like 'prove' is in use.
Expecting a reroll.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
source: <[email protected]>
* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config
Assorted updates to "--diff-merges=X" option.
May want to discard.
Breaking compatibility does not seem worth it.
source: <[email protected]>
* ab/imap-send-requires-curl (2023-02-02) 6 commits
- imap-send: correctly report "host" when using "tunnel"
- imap-send: remove old --no-curl codepath
- imap-send: make --curl no-optional
- imap-send: replace auto-probe libcurl with hard dependency
- imap-send doc: the imap.sslVerify is used with imap.tunnel
- imap-send: note "auth_method", not "host" on auth method failure
Give a hard dependency on cURL library to build "git imap-send", and remove the code to interact with IMAP server without using cURL.
Expecting a reroll.
The 'tunnel' part is still iffy.
cf. <[email protected]>
source: <[email protected]>
* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
. cat-file: quote-format name in error when using -z . cat-file: extract printing batch error message into function
"cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream).
Breaks "cat-file --batch-all-objects --batch-check". cf. <[email protected]>
source: <[email protected]>
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor out diff_change logic
- submodule: refactor is_submodule_modified()
- submodule: move status parsing into function
- submodule: rename strbuf variable
- run-command: add on_stderr_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule repositories in parallel.
Expecting a reroll.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com> cf. <[email protected]>
source: <[email protected]>
--------------------------------------------------
[Cooking]
* ds/fsck-pack-revindex (2023-04-17) 5 commits
(merged to 'next' on 2023-04-19 at 6fb9527bf5)
+ fsck: validate .rev file header
+ fsck: check rev-index position values
+ fsck: check rev-index checksums
+ fsck: create scaffolding for rev-index checks
+ Merge branch 'tb/pack-revindex-on-disk' into ds/fsck-pack-revindex (this branch uses tb/pack-revindex-on-disk.)
"git fsck" learned to validate the on-disk pack reverse index files.
Will merge to 'master'.
source: <[email protected]>
* tb/enable-cruft-packs-by-default (2023-04-18) 10 commits
- repository.h: drop unused gc_cruft_packs
- builtin/gc.c: make gc.cruftPacks enabled by default
- t/t9300-fast-import.sh: prepare for gc --cruft by default
- t/t6500-gc.sh: add additional test cases
- t/t6500-gc.sh: refactor cruft pack tests
- t/t6501-freshen-objects.sh: prepare for gc --cruft by default
- t/t5304-prune.sh: prepare for gc --cruft by default
- builtin/gc.c: ignore cruft packs with --keep-largest-pack
- builtin/repack.c: fix incorrect reference to '-C'
- pack-write.c: plug a leak in stage_tmp_packfiles()
When "gc" needs to retain unreachable objects, packing them into cruft packs (instead of exploding them into loose object files) has been offered as a more efficient option for some time. Now the use of cruft packs has been made the default and no longer considered an experimental feature.
Will merge to 'next'.
source: <[email protected]>
* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
- send-email: expose header information to git-send-email's sendemail-validate hook
- send-email: refactor header generation functions
"git send-email" learned to give the e-mail headers to the validate hook by passing an extra argument from the command line.
source: <[email protected]>
* ja/worktree-orphan (2023-04-17) 8 commits
- worktree add: emit warn when there is a bad HEAD
- worktree add: extend DWIM to infer --orphan
- worktree add: introduce "try --orphan" hint
- worktree add: add --orphan flag
- t2400: add tests to verify --quiet
- t2400: refactor "worktree add" opt exclusion tests
- t2400: print captured git output when finished
- worktree add: include -B in usage docs
'git worktree add' learned how to create a worktree based on an orphaned branch with --orphan.
Comments?
source: <[email protected]>
* gc/doc-cocci-updates (2023-04-12) 2 commits
- cocci: codify authoring and reviewing practices
- cocci: add headings to and reword README
Update documentation regarding Coccinelle patches.
Expecting review response.
cf. <[email protected]>
source: <[email protected]>
* jk/protocol-cap-parse-fix (2023-04-14) 7 commits
(merged to 'next' on 2023-04-17 at fd9bf05656)
+ v0 protocol: use size_t for capability length/offset
+ t5512: test "ls-remote --heads --symref" filtering with v0 and v2
+ t5512: allow any protocol version for filtered symref test
+ t5512: add v2 support for "ls-remote --symref" test
+ v0 protocol: fix sha1/sha256 confusion for capabilities^{}
+ t5512: stop referring to "v1" protocol
+ v0 protocol: fix infinite loop when parsing multi-valued capabilities
The code to parse capability list for v0 on-wire protocol fell into an infinite loop when a capability appears multiple times, which has been corrected.
Will merge to 'master'.
source: <[email protected]>
* kh/doc-interpret-trailers-updates (2023-04-12) 4 commits
- doc: interpret-trailers: fix example
- doc: interpret-trailers: don’t use deprecated config
- doc: interpret-trailers: use input redirection
- doc: interpret-trailers: don’t use heredoc in examples
Doc update.
Expecting a reroll.
cf. <[email protected]>, <[email protected]>
source: <[email protected]>
* ps/fix-geom-repack-with-alternates (2023-04-14) 10 commits (merged to 'next' on 2023-04-18 at de56e80363)
+ repack: disable writing bitmaps when doing a local repack
+ repack: honor -l when calculating pack geometry
+ t/helper: allow chmtime to print verbosely without modifying mtime
+ pack-objects: extend test coverage of --stdin-packs with alternates
+ pack-objects: fix error when same packfile is included and excluded
+ pack-objects: fix error when packing same pack twice
+ pack-objects: split out --stdin-packs tests into separate file
+ repack: fix generating multi-pack-index with only non-local packs
+ repack: fix trying to use preferred pack in alternates
+ midx: fix segfault with no packs and invalid preferred pack
Geometric repacking ("git repack --geometric=<n>") in a repository that borrows from an alternate object database had various corner case bugs, which have been corrected.
Will merge to 'master'.
source: <[email protected]>
* rj/send-email-validate-hook-count-messages (2023-04-14) 1 commit (merged to 'next' on 2023-04-18 at 0c3db0bd3b)
+ send-email: export patch counters in validate environment
The sendemail-validate validate hook learned to pass the total number of input files and where in the sequence each invocation is via environment variables.
Will merge to 'master'.
source: <[email protected]>
* tb/pack-revindex-on-disk (2023-04-13) 7 commits (merged to 'next' on 2023-04-19 at d6b90b44cf)
+ t: invert GIT_TEST_WRITE_REV_INDEX
+ config: enable pack.writeReverseIndex by default
+ pack-revindex: introduce pack.readReverseIndex
+ pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
+ pack-revindex: make load_pack_revindex take a repository
+ t5325: mark as leak-free
+ pack-write.c: plug a leak in stage_tmp_packfiles() (this branch is used by ds/fsck-pack-revindex.)
The on-disk reverse index that allows mapping from the pack offset to the object name for the object stored at the offset has been enabled by default.
Will merge to 'master'.
source: <[email protected]>
* fc/doc-use-datestamp-in-commit (2023-04-14) 3 commits
(merged to 'next' on 2023-04-20 at 3b6ccb62ec)
+ doc: set actual revdate for manpages
+ Merge branch 'fc/doc-stop-using-manversion' into fc/doc-use-datestamp-in-commit
+ Merge branch 'fc/remove-header-workarounds-for-asciidoc' into fc/doc-use-datestamp-in-commit (this branch uses fc/doc-stop-using-manversion.)
Instead of the time the formatter was run, show the timestamp recorded in the commit in the documentation.
Will merge to 'master'.
source: <[email protected]>
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits (merged to 'next' on 2023-04-20 at 2728a01622)
+ completion: complete AUTO_MERGE
+ Documentation: document AUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: complete REVERT_HEAD and BISECT_HEAD
+ revisions.txt: document more special refs
Document more pseudo-refs and teach the command line completion machinery to complete AUTO_MERGE.
Will merge to 'master'.
source: <[email protected]>
* tb/ban-strtok (2023-04-18) 6 commits
- banned.h: mark strtok() as banned
- t/helper/test-json-writer.c: avoid using strtok()
- t/helper/test-oidmap.c: avoid using strtok()
- t/helper/test-hashmap.c: avoid using strtok()
- string-list: introduce string_list_setlen()
- string-list: introduce string_list_split_in_place_multi()
Mark strtok() and strtok_r() to be banned.
Comments?
source: <[email protected]>
* fc/doc-stop-using-manversion (2023-04-10) 1 commit (merged to 'next' on 2023-04-14 at 0800fe5ab4)
+ doc: simplify man version
(this branch is used by fc/doc-use-datestamp-in-commit.)
Doc build simplification.
Will merge to 'master'.
source: <[email protected]>
* rn/sparse-diff-index (2023-04-10) 1 commit
- diff-index: enable sparse index
"git diff-index" command has been taught to work better with the sparse index.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- usage: clarify --recurse-submodules as a boolean
The "--[no-]recurse-submodules" option of "git checkout" and others supported an undocumented syntax --recurse-submodules=<value> where the value can spell a Boolean in various ways. The support for the syntax is being dropped.
Expecting a reroll.
cf. <ZDSTFwMFO7vbj/[email protected]>
source: <ZDSTFwMFO7vbj/[email protected]>
* ow/ref-filter-omit-empty (2023-04-13) 1 commit (merged to 'next' on 2023-04-14 at 2798986c60)
+ branch, for-each-ref, tag: add option to omit empty lines
"git branch --format=..." and "git format-patch --format=..." learns "--omit-empty" to hide refs that whose formatting result becomes an empty string from the output.
Will merge to 'master'.
source: <[email protected]>
* rn/sparse-describe (2023-04-03) 1 commit
(merged to 'next' on 2023-04-14 at 9699cfad2c)
+ describe: enable sparse index for describe
"git describe --dirty" learns to work better with sparse-index.
Will merge to 'master'.
source: <[email protected]>
* ah/format-patch-thread-doc (2023-04-03) 1 commit
(merged to 'next' on 2023-04-14 at acf141a832)
+ format-patch: correct documentation of --thread without an argument
Doc update.
Will merge to 'master'.
source: <[email protected]>
* ar/test-cleanup-unused-file-creation-part2 (2023-04-17) 6 commits
- t2019: don't create unused files
- t1502: don't create unused files
- t1450: don't create unused files
- t1300: don't create unused files
- t1300: fix config file syntax error descriptions
- t0300: don't create unused file
Test cleanup.
Comments?
source: <[email protected]>
* en/header-split-cache-h (2023-04-18) 25 commits
(merged to 'next' on 2023-04-18 at 55b4d95cac)
+ protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
(merged to 'next' on 2023-04-13 at b9afefff0b)
+ mailmap, quote: move declarations of global vars to correct unit
+ treewide: reduce includes of cache.h in other headers
+ treewide: remove double forward declaration of read_in_full
+ cache.h: remove unnecessary includes
+ treewide: remove cache.h inclusion due to pager.h changes
+ pager.h: move declarations for pager.c functions from cache.h
+ treewide: remove cache.h inclusion due to editor.h changes
+ editor: move editor-related functions and declarations into common file
+ treewide: remove cache.h inclusion due to object.h changes
+ object.h: move some inline functions and defines from cache.h
+ treewide: remove cache.h inclusion due to object-file.h changes
+ object-file.h: move declarations for object-file.c functions from cache.h
+ treewide: remove cache.h inclusion due to git-zlib changes
+ git-zlib: move declarations for git-zlib functions from cache.h
+ treewide: remove cache.h inclusion due to object-name.h changes
+ object-name.h: move declarations for object-name.c functions from cache.h
+ treewide: remove unnecessary cache.h inclusion
+ treewide: be explicit about dependence on mem-pool.h
+ treewide: be explicit about dependence on oid-array.h
+ treewide: be explicit about dependence on pack-revindex.h
+ treewide: be explicit about dependence on convert.h
+ treewide: be explicit about dependence on advice.h
+ treewide: be explicit about dependence on trace.h & trace2.h
+ Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h (this branch is used by en/header-split-cache-h-part-2.)
Header clean-up.
Will merge to 'master'.
source: <[email protected]>
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions
Fix fsmonitor on Windows when the filesystem path contains certain characters.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
- credential/wincred: store password_expiry_utc
Teach the recently invented "password expiry time" trait to the wincred credential helper.
Will merge to 'next'?
source: <[email protected]>
* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
- rebase -i: do not update "done" when rescheduling command
"rebase -i" moved a "rescheduled" insn in the todo file to the "done" list before it completed, which has been corrected.
Expecting clarification.
source: <[email protected]>
* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit (merged to 'next' on 2023-04-14 at 950f9ed807)
+ archive: improve support for running in subdirectory
"git archive" run from a subdirectory mishandled attributes and paths outside the current directory.
Will merge to 'master'.
source: <[email protected]>
* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom
"git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)" placeholder and friends.
Breaks CI.
cf. <[email protected]>
source: <[email protected]>
* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
- credential: new attribute oauth_refresh_token
The credential subsystem learns to help OAuth framework.
Needs Review.
source: <[email protected]>
* mh/credential-password-expiry-libsecret (2023-03-27) 1 commit
- credential/libsecret: support password_expiry_utc
The libsecret credential helper learns to handle the password expiry time information.
Needs Review.
source: <[email protected]>
* sl/diff-files-sparse (2023-03-22) 2 commits
- diff-files: integrate with sparse index
- t1092: add tests for git diff-files
Teach "diff-files" not to expand sparse-index unless needed.
Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
- branch: avoid unnecessary worktrees traversals
- branch: rename orphan branches in any worktree
- branch: description for orphan branch errors
- branch: use get_worktrees() in copy_or_rename_branch()
- branch: test for failures while renaming branches
Error messages given when working on an unborn branch that is checked out in another worktree have been improved.
Will merge to 'next'?
source: <[email protected]>
--------------------------------------------------
[Discarded]
* ed/fsmonitor-inotify (2022-12-13) 6 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux . fsmonitor: determine if filesystem is local or remote . fsmonitor: prepare to share code between Mac OS and Linux
Bundled fsmonitor for Linux using inotify API.
Seems to break asan job at CI when merged to 'seen'. cf. <[email protected]>
source: <[email protected]>
* rj/sendemail-validate-series-hook (2023-04-05) 1 commit . hooks: add sendemail-validate-series
"git send-email" learns a new hook that takes the entire set of patch files from its standard input to validate them in one go, instead of getting called once per each file.
Superseded by the rj/send-email-validate-hook-count-messages topic.
source: <[email protected]>
* my/wildmatch-cleanups (2023-02-27) 5 commits
. wildmatch: more cleanups after killing uchar
. wildmatch: use char instead of uchar
. wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring . wildmatch: remove IS*() macros
. git-compat-util: add isblank() and isgraph()
Code clean-up.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <[email protected]>
* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits . add: reject nested repositories
. tests: remove duplicate .gitmodules path
. tests: use git submodule add and fix expected status . tests: use git submodule add and fix expected diffs . tests: Use git submodule add instead of git add
. t4041, t4060: modernize test style
Forbid "git add dir" from adding a gitlink to the index.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <[email protected]>
tb/ban-strtok (was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
Quoted 9 lines · Junio C Hamano
* tb/ban-strtok (2023-04-18) 6 commits
-banned.h: markstrtok()as banned
-t/helper/test-json-writer.c: avoid usingstrtok()
-t/helper/test-oidmap.c: avoid usingstrtok()
-t/helper/test-hashmap.c: avoid usingstrtok()
- string-list: introducestring_list_setlen()
- string-list: introducestring_list_split_in_place_multi()Mark
strtok()andstrtok_r()to be banned.
The latest round bans only strtok(), so this description would need updating (probably to something as simple as "Mark strtok() as banned").
Quoted 1 line
Comments?
I would be curious to get Peff's (cc'd) thoughts on this series, since it was something that he and I were talking about off-list. It was one of those "let me see how hard this would be..." topics, that by the time I finished investigating, I had the series ready to go.
Thanks,
Taylor
Re: tb/ban-strtok (was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
Quoted 14 lines · Taylor Blau
Quoted 9 lines · Junio C Hamano
* tb/ban-strtok (2023-04-18) 6 commits
-banned.h: markstrtok()as banned
-t/helper/test-json-writer.c: avoid usingstrtok()
-t/helper/test-oidmap.c: avoid usingstrtok()
-t/helper/test-hashmap.c: avoid usingstrtok()
- string-list: introducestring_list_setlen()
- string-list: introducestring_list_split_in_place_multi()Mark
strtok()andstrtok_r()to be banned.The latest round bans only
strtok(), so this description would need updating (probably to something as simple as "Markstrtok()as banned").
Quoted 6 lines
Quoted 1 line
Comments?
I would be curious to get Peff's (cc'd) thoughts on this series, since it was something that he and I were talking about off-list. It was one of those "let me see how hard this would be..." topics, that by the time I finished investigating, I had the series ready to go.
I left a few small comments on the series.
On the greater question of "should strtok or strtok_r be banned", I don't have too strong a feeling. The hidden global state in strtok() is bad, so probably worth outlawing.
I tend to think that strtok_r() is a bit confusing to use. As Chris noted, strsep() is better, but not necessarily as portable. Using ptr/len pairs to parse via strcspn(), etc, seems better still. But that is mostly aesthetics and preference, so I'm OK if we don't outright ban strtok_r().
-Peff
Re: tb/ban-strtok
Quoted 10 lines · Jeff King
Quoted 4 lines
I would be curious to get Peff's (cc'd) thoughts on this series, since it was something that he and I were talking about off-list. It was one of those "let me see how hard this would be..." topics, that by the time I finished investigating, I had the series ready to go.
I left a few small comments on the series.
On the greater question of "should strtok or
strtok_rbe banned", I don't have too strong a feeling. The hidden global state instrtok()is bad, so probably worth outlawing.
I was and still am inclined to say both can be banned. The primary problem I had with the original series was the way the replacement was sold (namely, string_list based solution is not universally superior but it was sold as if it were, and the sales pitch should have been that in our codebase there is no usecase where strtok_r() is more suitable than string_list_split and friends).
Quoted 5 lines
I tend to think that
strtok_r()is a bit confusing to use. As Chris noted,strsep()is better, but not necessarily as portable. Using ptr/len pairs to parse viastrcspn(), etc, seems better still. But that is mostly aesthetics and preference, so I'm OK if we don't outright banstrtok_r().
I am OK if we do ;-)
en/header-split-cache-h-part-2 (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
In reply to Junio C HamanoQuoted 26 lines · Junio C Hamano
* en/header-split-cache-h-part-2 (2023-04-18) 23 commits
- reftable: ensuregit-compat-util.his the first (indirect) include
-diff.h: reduce unnecessary includes
-object-store.h: reduce unnecessary includes
-commit.h: reduce unnecessary includes
- fsmonitor: reduce includes ofcache.h
-cache.h: remove unnecessary headers
- treewide: removecache.hinclusion due to previous changes
- cache,tree: move basic name compare functions from read-cache to tree
- cache,tree: movecmp_cache_name_comparefrom tree.[ch] toread-cache.c
-hash.h,repository.h: reverse the order of these dependencies
-tree-diff.c: moveS_DIFFTREE_IFXMIN_NEQdefine fromcache.h
-dir.h: move DTYPE defines fromcache.h
-versioncmp.h: move declarations forversioncmp.cfunctions fromcache.h
-ws.h: move declarations forws.cfunctions fromcache.h
-match-trees.h: move declarations formatch-trees.cfunctions fromcache.h
-pkt-line.h: move declarations forpkt-line.cfunctions fromcache.h
-base85.h: move declarations forbase85.cfunctions fromcache.h
-copy.h: move declarations forcopy.cfunctions fromcache.h
-server-info.h: move declarations forserver-info.cfunctions fromcache.h
-packfile.h: movepack_windowandpack_entryfromcache.h
-symlinks.h: move declarations forsymlinks.cfunctions fromcache.h
- treewide: be explicit about dependence onstrbuf.h
- Merge branch 'en/header-split-cache-h' into en/header-split-cache-h-part-2 (this branch uses en/header-split-cache-h.)
Quoted 4 lines
More header clean-up.
Will merge to 'next'?
source: <[email protected]>
Not yet; please mark as expecting a re-roll. I need to fix up the hash.h/repository.h patch
(https://lore.kernel.org/git/[email protected]/)
Re: en/header-split-cache-h-part-2
Quoted 5 lines · Elijah Newren
Quoted 2 lines
Will merge to 'next'?
source: <[email protected]>Not yet; please mark as expecting a re-roll. I need to fix up the
hash.h/repository.hpatch
Thanks.
pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
In reply to Junio C HamanoQuoted 9 lines · Junio C Hamano
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits (merged to 'next' on 2023-04-20 at
2728a01622)
+ completion: completeAUTO_MERGE
+ Documentation: documentAUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: completeREVERT_HEADandBISECT_HEAD
+ revisions.txt: document more special refs
Quoted 5 lines
Document more pseudo-refs and teach the command line completion machinery to complete
AUTO_MERGE.Will merge to 'master'.
source: <[email protected]>
This merged to next already? Doh.
There was some misleading text (and a few typos) in 4/5, and good suggestions from both Eric and Victoria in the thread for wording and display improvements.
Perhaps we can at least wait for a fixup patch?
Re: pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
Hi Junio and Elijah,
Le 2023-04-22 à 11:00, Elijah Newren a écrit :
Quoted 16 lines · Junio C Hamano
Quoted 9 lines
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits (merged to 'next' on 2023-04-20 at
2728a01622)
+ completion: completeAUTO_MERGE
+ Documentation: documentAUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: completeREVERT_HEADandBISECT_HEAD
+ revisions.txt: document more special refsQuoted 5 lines
Document more pseudo-refs and teach the command line completion machinery to complete
AUTO_MERGE.Will merge to 'master'.
source: <[email protected]>
Quoted 7 lines
This merged to next already? Doh.
There was some misleading text (and a few typos) in 4/5, and good suggestions from both Eric and Victoria in the thread for wording and display improvements.
Perhaps we can at least wait for a fixup patch?
Yes, sorry for not having send a v2 yet (or responding to reviews), I'm very busy with work.
I'm also surprised that this is already in 'next' since your "What's cooking" of the 17th did not mention "will merge to next" for this branch [1].
I've fixed the typos and also would like to incorporate Victoria's suggestion.
I probably won't have time to do this before May though. I'll send a v2 then. I can do fixup patches on top if it stays in next, or I can wait till next is rebuilt... whatever works best.
Cheers,
Philippe.
Re: pb/complete-and-document-auto-merge-and-friends
In reply to Elijah NewrenQuoted 5 lines · Elijah Newren
Quoted 2 lines · Junio C Hamano
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
...
Perhaps we can at least wait for a fixup patch?
OK. Thanks for stopping me.