To: git@vger.kernel.org
-Subject: What's cooking in git.git (Apr 2023, #06; Thu, 20)
-X-master-at: 9c6990cca24301ae8f82bf6291049667a0aef14b
-X-next-at: bd7f14d9353b7ce9acf82b32f80f585373a5ebe3
+Subject: What's cooking in git.git (Apr 2023, #07; Tue, 25)
+X-master-at: 2807bd2c10606e590886543afe4e4f208dddd489
+X-next-at: 96c395b00cfdcc2a001874b3e5d6fadf5fd01d38
Bcc: lwn@lwn.net, gitster@pobox.com
-What's cooking in git.git (Apr 2023, #06; Thu, 20)
+What's cooking in git.git (Apr 2023, #07; Tue, 25)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
topic without enough support may be discarded after a long period of
no activity.
+A set of new maintenance releases to address some security issues
+have been made; all the integration tracks also have the same fixes.
+
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.
--------------------------------------------------
[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
+* 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
- Test fix.
- source: <20230408205450.569548-1-rybak.a.v@gmail.com>
+ Doc update.
+ source: <20230403040724.642513-1-alexhenrie24@gmail.com>
-* 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
+* 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.)
- "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: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
+ Header clean-up.
+ source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
-* 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
+* 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.)
- Code clean-up to replace a hardcoded constant with a CPP macro.
- source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
+ Doc build simplification.
+ source: <20230408001829.11031-1-felipe.contreras@gmail.com>
-* rs/remove-approxidate-relative (2023-04-10) 1 commit
- (merged to 'next' on 2023-04-13 at bd7df5f98c)
- + date: remove approxidate_relative()
+* 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 approxidate() API has been simplified by losing an extra
- function that did the same thing as another one.
- source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
+ 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.
+ source: <20230414212404.GA639653@coredump.intra.peff.net>
-* 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
+* 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
- 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: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
+ "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.
+ source: <20230407175316.6404-1-oystwa@gmail.com>
---------------------------------------------------
-[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
+* 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
- Test updates.
+ 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.
+ source: <cover.1681452028.git.ps@pks.im>
- Expecting a reroll.
- source: <20230418175034.982433-1-rybak.a.v@gmail.com>
+* 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
-* 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.)
+ 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.
+ source: <20230414155249.667180-1-robin@jarry.cc>
- More header clean-up.
- Will merge to 'next'?
- source: <pull.1517.git.1681614205.gitgitgadget@gmail.com>
+* 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.
+ source: <20230403164749.246001-1-nanth.raghul@gmail.com>
-* 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.
+* 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.
+ source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
+
+--------------------------------------------------
+[New Topics]
+
+* ek/completion-use-read-r-to-read-literally (2023-04-20) 1 commit
+ (merged to 'next' on 2023-04-24 at 25bf3b808b)
+ + completion: suppress unwanted unescaping of `read`
+
+ The completion script used to use bare "read" without the "-r"
+ option to read the contents of various state files, which risked
+ getting confused with backslashes in them. This has been
+ corrected.
Will merge to 'master'.
- source: <20230418070048.2209469-1-felipe.contreras@gmail.com>
+ source: <20230420223800.1698197-1-myoga.murase@gmail.com>
-* jk/gpg-trust-level-fix (2023-04-19) 1 commit
- - gpg-interface: set trust level of missing key to "undefined"
+* pw/rebase-i-after-failure (2023-04-21) 6 commits
+ - rebase -i: fix adding failed command to the todo list
+ - rebase: fix rewritten list for failed pick
+ - rebase --continue: refuse to commit after failed command
+ - sequencer: factor out part of pick_commits()
+ - rebase -i: remove patch file after conflict resolution
+ - rebase -i: move unlink() calls
- 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.
+ Various fixes to the behaviour of "rebase -i" when the command got
+ interrupted by conflicting changes.
+
+ Needs review.
+ source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
+
+
+* jk/blame-fake-commit-label (2023-04-24) 1 commit
+ - blame: use different author name for fake commit generated by --contents
+
+ The output given by "git blame" that attributes a line to contents
+ taken from the file specified by the "--contents" option shows it
+ differently from a line attributed to the working tree file.
Will merge to 'next'.
- source: <20230419012957.GA503941@coredump.intra.peff.net>
+ source: <20230424193508.2245566-1-jacob.e.keller@intel.com>
-* 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
+* jk/misc-null-check-fixes (2023-04-24) 2 commits
+ - fetch_bundle_uri(): drop pointless NULL check
+ - notes: clean up confusing NULL checks in init_notes()
- "git fetch" learned the "--output-format" option that emits what it
- did in a machine-parseable format.
+ Code clean-up.
- Needs review.
- source: <cover.1681906948.git.ps@pks.im>
+ Will merge to 'next'.
+ source: <20230422135455.GA3942740@coredump.intra.peff.net>
-* 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
+* jk/parse-commit-with-malformed-ident (2023-04-25) 4 commits
+ - parse_commit(): describe more date-parsing failure modes
+ - parse_commit(): handle broken whitespace-only timestamp
+ - parse_commit(): parse timestamp from end of line
+ - t4212: avoid putting git on left-hand side of pipe
- source: <pull.1518.git.1681974847078.gitgitgadget@gmail.com>
+ The commit object parser has been taught to be a bit more lenient
+ to parse timestamps on the author/committer line with a malformed
+ author/committer ident.
+ Will merge to 'next'?
+ Protecting against mischieves using \f and \v may be worth doing.
+ source: <20230425055244.GA4014505@coredump.intra.peff.net>
-* ma/gittutorial-fixes (2023-04-20) 2 commits
- - gittutorial: wrap literal examples in backticks
- - gittutorial: drop early mention of origin
- source: <cover.1681579244.git.martin.agren@gmail.com>
+* sl/sparse-write-tree-part-2 (2023-04-24) 1 commit
+ - write-tree: optimize sparse integration
+ Fix-up to a topic already graduated to 'master'.
-* sg/retire-unused-cocci (2023-04-20) 1 commit
- - cocci: remove 'unused.cocci'
+ Iffy.
+ source: <20230423071243.1863977-1-cheskaqiqi@gmail.com>
- source: <20230420205350.600760-1-szeder.dev@gmail.com>
+
+* tb/pack-bitmap-traversal-with-boundary (2023-04-25) 3 commits
+ - pack-bitmap.c: use commit boundary during bitmap traversal
+ - pack-bitmap.c: extract `fill_in_bitmap()`
+ - revision: support tracking uninteresting commits
+
+ The object traversal using reachability bitmap done by
+ "pack-object" has been tweaked to take advantage of the fact that
+ using "boundary" commits as representative of all the uninteresting
+ ones can save quite a lot of object enumeration.
+
+ source: <cover.1682380788.git.me@ttaylorr.com>
--------------------------------------------------
[Stalled]
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
-* 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'
+* tl/notes-separator (2023-04-25) 6 commits
+ - notes.c: introduce "--[no-]stripspace" option
+ - notes.c: append separator instead of insert by pos
+ - notes.c: introduce '--separator=<paragraph-break>' option
+ - t3321: add test cases about the notes stripspace behavior
+ - 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. <xmqqy1nf8c0f.fsf@gitster.g>
- source: <cover.1680012650.git.dyroneteng@gmail.com>
+ source: <cover.1682429602.git.dyroneteng@gmail.com>
* ab/tag-object-type-errors (2022-11-22) 5 commits
--------------------------------------------------
[Cooking]
+* ar/config-count-tests-updates (2023-04-24) 3 commits
+ - t1300: add tests for missing keys
+ - t1300: check stderr for "ignores pairs" tests
+ - t1300: drop duplicate test
+
+ Test updates.
+ source: <20230423134649.431783-1-rybak.a.v@gmail.com>
+
+
+* en/header-split-cache-h-part-2 (2023-04-24) 22 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-ll.h: split out of hash.h to remove dependency on repository.h
+ - 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
+
+ More header clean-up.
+ source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
+
+
+* 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: <20230418070048.2209469-1-felipe.contreras@gmail.com>
+
+
+* jk/gpg-trust-level-fix (2023-04-19) 1 commit
+ (merged to 'next' on 2023-04-21 at eb8413dc9d)
+ + 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 'master'.
+ source: <20230419012957.GA503941@coredump.intra.peff.net>
+
+
+* 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: <cover.1681906948.git.ps@pks.im>
+
+
+* en/ort-finalize-after-0-merges-fix (2023-04-24) 1 commit
+ (merged to 'next' on 2023-04-25 at 1bc935225b)
+ + merge-ort: fix calling merge_finalize() with no intermediate merge
+
+ A small API fix to the ort merge strategy backend.
+
+ Will merge to 'master'.
+ source: <pull.1518.v2.git.1682194930766.gitgitgadget@gmail.com>
+
+
+* ma/gittutorial-fixes (2023-04-20) 2 commits
+ - gittutorial: wrap literal examples in backticks
+ - gittutorial: drop early mention of origin
+
+ source: <cover.1681579244.git.martin.agren@gmail.com>
+
+
+* sg/retire-unused-cocci (2023-04-20) 1 commit
+ - cocci: remove 'unused.cocci'
+
+ source: <20230420205350.600760-1-szeder.dev@gmail.com>
+
+
* ds/fsck-pack-revindex (2023-04-17) 5 commits
(merged to 'next' on 2023-04-19 at 6fb9527bf5)
+ fsck: validate .rev file header
* 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()
+ (merged to 'next' on 2023-04-21 at 068bf86fc3)
+ + 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
of cruft packs has been made the default and no longer considered
an experimental feature.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <cover.1681850424.git.me@ttaylorr.com>
source: <pull.1495.git.git.1681329955.gitgitgadget@gmail.com>
-* 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: <20230414212404.GA639653@coredump.intra.peff.net>
-
-
* kh/doc-interpret-trailers-updates (2023-04-12) 4 commits
- doc: interpret-trailers: fix example
- doc: interpret-trailers: don’t use deprecated config
source: <cover.1681326818.git.code@khaugsbakk.name>
-* 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: <cover.1681452028.git.ps@pks.im>
-
-
-* 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: <20230414155249.667180-1-robin@jarry.cc>
-
-
* 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`
+ 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.
Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.
- Will merge to 'master'.
+ On hold, waiting for a fix-up.
+ cf. <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
-* tb/ban-strtok (2023-04-18) 6 commits
- - banned.h: mark `strtok()` as banned
+* tb/ban-strtok (2023-04-24) 6 commits
+ - banned.h: mark `strtok()` and `strtok_r()` 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()`
+ - string-list: multi-delimiter `string_list_split_in_place()`
Mark strtok() and strtok_r() to be banned.
-
- Comments?
- source: <cover.1681845518.git.me@ttaylorr.com>
-
-
-* 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: <20230408001829.11031-1-felipe.contreras@gmail.com>
+ source: <cover.1682374789.git.me@ttaylorr.com>
* rn/sparse-diff-index (2023-04-10) 1 commit
source: <ZDSTFwMFO7vbj/du@google.com>
-* 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: <20230407175316.6404-1-oystwa@gmail.com>
-
-
-* 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: <20230403164749.246001-1-nanth.raghul@gmail.com>
-
-
-* 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: <20230403040724.642513-1-alexhenrie24@gmail.com>
-
-
* ar/test-cleanup-unused-file-creation-part2 (2023-04-17) 6 commits
- t2019: don't create unused files
- t1502: don't create unused files
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
-* 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: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
-
-
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
-* 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: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
-
-
-* 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: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@web.de>
-
-
* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
-* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
+* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
- credential: new attribute oauth_refresh_token
The credential subsystem learns to help OAuth framework.
Needs Review.
- source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
+ source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
* mh/credential-password-expiry-libsecret (2023-03-27) 1 commit
source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
-* sl/diff-files-sparse (2023-03-22) 2 commits
+* sl/diff-files-sparse (2023-04-24) 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. <c382017a-8c65-24ba-5092-6b46428d8b9b@github.com>
- source: <20230322161820.3609-1-cheskaqiqi@gmail.com>
+ source: <20230423010721.1402736-1-cheskaqiqi@gmail.com>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
--------------------------------------------------
[Discarded]
+* 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.
+
+ Replaced with a much more enhanced pw/rebase-i-after-failure topic.
+ source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
+
+
* ed/fsmonitor-inotify (2022-12-13) 6 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
projects / thirdparty / git.git / commitdiff
