global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 15:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

What's cooking (2023/06 #06)

Browse Source
This commit is contained in:
Junio C Hamano
2023-06-23 13:47:39 -07:00
parent c54a1591f3
commit bb016b8952
1 changed files with 284 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

778
whats-cooking.txt
View File

@@ -1,10 +1,10 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jun 2023, #05; Tue, 20)
X-master-at: 6640c2d06d112675426cf436f0594f0e8c614848
X-next-at: a1a0a3961aa073b8353158c01d6552ef94ac663d
Subject: What's cooking in git.git (Jun 2023, #06; Fri, 23)
X-master-at: 6ff334181cfb6485d3ba50843038209a2a253907
X-next-at: 577bbd8c9fd2f098bfa6e5dc606afb1b1ce7a55e
Bcc: lwn@lwn.net, gitster@pobox.com
What's cooking in git.git (Jun 2023, #05; Tue, 20)
What's cooking in git.git (Jun 2023, #06; Fri, 23)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@@ -48,228 +48,89 @@ Release tarballs are available at:
--------------------------------------------------
[Graduated to 'master']
* jc/test-modernization (2023-05-19) 20 commits
(merged to 'next' on 2023-06-15 at 811ac3f7ad)
+ t7101-reset-empty-subdirs: modernize test format
+ t6050-replace: modernize test format
+ t5306-pack-nobase: modernize test format
+ t5303-pack-corruption-resilience: modernize test format
+ t5301-sliding-window: modernize test format
+ t5300-pack-object: modernize test format
+ t4206-log-follow-harder-copies: modernize test format
+ t4202-log: modernize test format
+ t4004-diff-rename-symlink: modernize test format
+ t4003-diff-rename-1: modernize test format
+ t4002-diff-basic: modernize test format
+ t3903-stash: modernize test format
+ t3700-add: modernize test format
+ t3500-cherry: modernize test format
+ t1006-cat-file: modernize test format
+ t1002-read-tree-m-u-2way: modernize test format
+ t1001-read-tree-m-2way: modernize test format
+ t3210-pack-refs: modernize test format
+ t0030-stripspace: modernize test format
+ t0000-basic: modernize test format
(this branch is used by jc/test-modernization-2.)
* as/dtype-compilation-fix (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 267100947e)
+ statinfo.h: move DTYPE defines from dir.h
Originally merged to 'next' on 2023-06-13
source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
Compilation fix for platforms without D_TYPE in struct dirent.
source: <20230606205935.3183276-1-asedeno@google.com>
* jc/test-modernization-2 (2023-05-23) 10 commits
(merged to 'next' on 2023-06-15 at 01df673682)
+ t9400-git-cvsserver-server: modernize test format
+ t9200-git-cvsexportcommit: modernize test format
+ t9104-git-svn-follow-parent: modernize test format
+ t9100-git-svn-basic: modernize test format
+ t7700-repack: modernize test format
+ t7600-merge: modernize test format
+ t7508-status: modernize test format
+ t7201-co: modernize test format
+ t7111-reset-table: modernize test format
+ t7110-reset-merge: modernize test format
(this branch uses jc/test-modernization.)
* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
(merged to 'next' on 2023-06-15 at 377b9f9a00)
+ add: test use of brackets when color is disabled
+ add: check color.ui for interactive add
Originally merged to 'next' on 2023-06-13
Test style updates.
source: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
The reimplemented "git add -i" did not honor color.ui configuration.
source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits
(merged to 'next' on 2023-06-15 at 268459fc6a)
+ ci: drop linux-clang job
+ ci: run ASan/UBSan in a single job
+ ci: use clang for ASan/UBSan checks
* ds/disable-replace-refs (2023-06-12) 3 commits
(merged to 'next' on 2023-06-15 at e7baddb745)
+ repository: create read_replace_refs setting
+ replace-objects: create wrapper around setting
+ repository: create disable_replace_refs()
(this branch uses tb/pack-bitmap-traversal-with-boundary.)
Originally merged to 'next' on 2023-06-12
Introduce a mechanism to disable replace refs globally and per
repository.
source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
Clang's sanitizer implementation seems to work better than GCC's.
source: <20230601180220.GA4167745@coredump.intra.peff.net>
* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits
(merged to 'next' on 2023-06-15 at 6848e0b8e6)
+ diff: detect pathspec magic not supported by --follow
+ diff: factor out --follow pathspec check
+ pathspec: factor out magic-to-name function
Originally merged to 'next' on 2023-06-13
"git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
source: <20230601173724.GA4158369@coredump.intra.peff.net>
* kh/use-default-notes-doc (2023-06-06) 2 commits
(merged to 'next' on 2023-06-15 at f25ced157e)
+ notes: move the documentation to the struct
+ notes: update documentation for `use_default_notes`
Originally merged to 'next' on 2023-06-13
Doc update.
source: <cover.1685958731.git.code@khaugsbakk.name>
* la/doc-interpret-trailers (2023-06-14) 9 commits
(merged to 'next' on 2023-06-15 at 6ff4a2b913)
+ doc: trailer: add more examples in DESCRIPTION
+ doc: trailer: mention 'key' in DESCRIPTION
+ doc: trailer.<token>.command: emphasize deprecation
+ doc: trailer: use angle brackets for <token> and <value>
+ doc: trailer: remove redundant phrasing
+ doc: trailer: examples: avoid the word "message" by itself
+ doc: trailer: drop "commit message part" phrasing
+ doc: trailer: swap verb order
+ doc: trailer: fix grammar
Originally merged to 'next' on 2023-06-14
Doc update.
source: <pull.1506.v4.git.git.1686797630.gitgitgadget@gmail.com>
* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit
(merged to 'next' on 2023-06-15 at 62e19d66fb)
+ commit-reach: fix memory leak in get_reachable_subset()
Originally merged to 'next' on 2023-06-12
Plug memory leak.
source: <20230603002819.1122129-1-mh@glandium.org>
* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits
(merged to 'next' on 2023-06-15 at ebe3216719)
+ 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
+ revisions.txt: use description list for special refs
Originally merged to 'next' on 2023-06-13
Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.
source: <pull.1515.v2.git.1684783741.gitgitgadget@gmail.com>
* ps/fetch-cleanups (2023-05-17) 9 commits
(merged to 'next' on 2023-06-15 at 33878153a5)
+ fetch: use `fetch_config` to store "submodule.fetchJobs" value
+ fetch: use `fetch_config` to store "fetch.parallel" value
+ fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
+ fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
+ fetch: use `fetch_config` to store "fetch.pruneTags" value
+ fetch: use `fetch_config` to store "fetch.prune" value
+ fetch: pass through `fetch_config` directly
+ fetch: drop unneeded NULL-check for `remote_ref`
+ fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
Originally merged to 'next' on 2023-06-12
Code clean-up.
cf. <20230519002128.GD2442034@coredump.intra.peff.net>
source: <cover.1684324059.git.ps@pks.im>
* tb/submodule-null-deref-fix (2023-05-25) 1 commit
(merged to 'next' on 2023-06-15 at 8cb6a7710a)
+ builtin/submodule--helper.c: handle missing submodule URLs
Originally merged to 'next' on 2023-06-13
"git submodule" code trusted the data coming from the config (and
the in-tree .gitmodules file) too much without validating, leading
to NULL dereference if the user mucks with a repository (e.g.
submodule.<name>.url is removed). This has been corrected.
source: <ae6cf3fa461b85e346f034371dae56a2790dfa20.1684957882.git.me@ttaylorr.com>
* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit
(merged to 'next' on 2023-06-15 at 4e52ad2fb3)
+ surround %s with quotes when failed to lookup commit
Originally merged to 'next' on 2023-06-12
Error message fix.
source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>
* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit
(merged to 'next' on 2023-06-15 at 2d2446ff97)
+ trace2 tests: fix PTHREADS prereq
Originally merged to 'next' on 2023-06-12
Test fix.
source: <20230525031218.3554586-1-tmz@pobox.com>
* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit
(merged to 'next' on 2023-06-15 at dd97dd32f3)
+ t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
Originally merged to 'next' on 2023-06-12
Test fix.
source: <20230525031026.3554406-1-tmz@pobox.com>
* vd/worktree-config-is-per-repository (2023-05-26) 3 commits
(merged to 'next' on 2023-06-15 at 6301770cd6)
+ repository: move 'repository_format_worktree_config' to repo scope
+ config: pass 'repo' directly to 'config_with_options()'
+ config: use gitdir to get worktree config
Originally merged to 'next' on 2023-06-13
The value of config.worktree is per-repository, but has been kept
in a singleton global variable per process. This has been OK as
most Git operations interacted with a single repository at a time,
but not right for operations like recursive "grep" that want to
access multiple repositories from a single process without forking.
The global variable has been eliminated and made into a member in
the per-repository data structure.
cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>
cf. <kl6lr0qwno2q.fsf@chooglen-macbookpro.roam.corp.google.com>
source: <pull.1536.v2.git.1685064781.gitgitgadget@gmail.com>
--------------------------------------------------
[New Topics]
* gc/discover-not-setup (2023-06-16) 1 commit
(merged to 'next' on 2023-06-16 at 27d1cd2a1b)
+ setup.c: don't setup in discover_git_directory()
discover_git_directory() no longer touches the_repository.
Will merge to 'master'.
source: <pull.1526.git.git.1686771358484.gitgitgadget@gmail.com>
* ja/worktree-orphan (2023-05-17) 8 commits
(merged to 'next' on 2023-06-15 at 16bb552b79)
+ 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: cleanup created worktree in test
+ worktree add: include -B in usage docs
Originally merged to 'next' on 2023-06-14
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
source: <20230517214711.12467-1-jacobabel@nullpo.dev>
* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
(merged to 'next' on 2023-06-16 at bfc01bd5e2)
+ diff-lib: honor override_submodule_config flag bit
Even when diff.ignoreSubmodules tells us to ignore submodule
changes, "git commit" with an index that already records changes to
submodules should include the submodule changes in the resulting
commit, but it did not.
source: <20230614164856.3186012-2-sokcevic@google.com>
* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
(merged to 'next' on 2023-06-16 at ebb72b9bd8)
+ CodingGuidelines: use octal escapes, not hex
Suggest to refrain from using hex literals that are non-portable
when writing printf(1) format strings.
source: <20230614213145.475607-1-jonathantanmy@google.com>
* la/docs-typofixes (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 56ddcb16e6)
+ docs: typofixes
Typofixes.
source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
* mh/credential-erase-improvements (2023-06-15) 2 commits
(merged to 'next' on 2023-06-16 at 5a3ed25303)
+ credential: erase all matching credentials
@@ -280,45 +141,37 @@ Release tarballs are available at:
source: <pull.1525.v4.git.git.1686856773.gitgitgadget@gmail.com>
* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
- gc: add `gc.repackFilterTo` config option
- repack: implement `--filter-to` for storing filtered out objects
- gc: add `gc.repackFilter` config option
- repack: add `--filter=<filter-spec>` option
- repack: refactor finishing pack-objects command
- repack: refactor piping an oid to a command
- t/helper: add 'find-pack' test-tool
- pack-objects: add `--print-filtered` to print omitted objects
- pack-objects: allow `--filter` without `--stdout`
* ps/cat-file-null-output (2023-06-12) 5 commits
(merged to 'next' on 2023-06-15 at e841ad2be5)
+ cat-file: add option '-Z' that delimits input and output with NUL
+ cat-file: simplify reading from standard input
+ strbuf: provide CRLF-aware helper to read until a specified delimiter
+ t1006: modernize test style to use `test_cmp`
+ t1006: don't strip timestamps from expected results
"git repack" machinery learns to pay attention to the "--filter="
option.
Needs review.
source: <20230614192541.1599256-1-christian.couder@gmail.com>
"git cat-file --batch" and friends learned "-Z" that uses NUL
delimiter for both input and output.
source: <cover.1686028409.git.ps@pks.im>
* js/cmake-wo-cache-h (2023-06-15) 1 commit
(merged to 'next' on 2023-06-16 at b138273e7e)
+ cmake: adapt to `cache.h` being no more
(this branch uses en/header-split-cache-h-part-3.)
* rj/leakfixes (2023-06-17) 11 commits
(merged to 'next' on 2023-06-17 at 49e54a88e2)
+ tests: mark as passing with SANITIZE=leak
+ config: fix a leak in git_config_copy_or_rename_section_in_file
+ branch: fix a leak in cmd_branch
+ branch: fix a leak in setup_tracking
+ rev-parse: fix a leak with --abbrev-ref
(merged to 'next' on 2023-06-16 at d9330ea230)
+ branch: fix a leak in setup_tracking
+ branch: fix a leak in check_tracking_branch
+ branch: fix a leak in inherit_tracking
+ branch: fix a leak in dwim_and_setup_tracking
+ remote: fix a leak in query_matches_negative_refspec
+ config: fix a leak in git_config_copy_or_rename_section_in_file
Build fix in en/header-split-cache-h-part-3 topic.
Will merge to 'master'.
source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
* ps/revision-stdin-with-options (2023-06-15) 3 commits
- revision: handle pseudo-opts in `--stdin` mode
- revision: small readability improvement for reading from stdin
- revision: reorder `read_revisions_from_stdin()`
The set-up code for the get_revision() API now allows feeding
options like --all and --not in the --stdin mode.
Will merge to 'next'?
source: <cover.1686839572.git.ps@pks.im>
Leakfixes
source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit
@@ -326,45 +179,115 @@ Release tarballs are available at:
+ ls-tree: fix documentation of %x format placeholder
Doc update.
Will merge to 'master'.
source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>
* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
(merged to 'next' on 2023-06-20 at 08e5f2a6b5)
+ commit: pass --no-divider to interpret-trailers
* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
(merged to 'next' on 2023-06-16 at 6bb4425334)
+ run-command: report exec error even on ENOENT
+ t1800: loosen matching of error message for bad shebang
When "git commit --trailer=..." invokes the interpret-trailers
machinery, it knows what it feeds to interpret-trailers is a full
log message without any patch, but failed to express that by
passing the "--no-divider" option, which has been corrected.
Simplify error message when run-command fails to start a command.
source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
* sl/worktree-sparse (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at ca0a7edcc5)
+ worktree: integrate with sparse-index
"git worktree" learned to work better with sparse index feature.
source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
* tb/gc-recent-object-hook (2023-06-12) 2 commits
(merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
+ gc: introduce `gc.recentObjectsHook`
+ reachable.c: extract `obj_is_recent()`
"git pack-objects" learned to invoke a new hook program that
enumerates extra objects to be used as anchoring points to keep
otherwise unreachable objects in cruft packs.
source: <cover.1686178684.git.me@ttaylorr.com>
* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 6546fee734)
+ pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
Gracefully deal with a stale MIDX file that lists a packfile that
no longer exists.
source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
+ pack-bitmap.c: use commit boundary during bitmap traversal
+ pack-bitmap.c: extract `fill_in_bitmap()`
+ object: add object_array initializer helper function
(this branch is used by ds/disable-replace-refs.)
Originally merged to 'next' on 2023-06-15
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.1683567065.git.me@ttaylorr.com>
* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 19770e970a)
+ t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
Test update.
source: <20230606214707.55739-1-tmz@pobox.com>
--------------------------------------------------
[New Topics]
* ds/remove-idx-before-pack (2023-06-20) 1 commit
(merged to 'next' on 2023-06-23 at fa97bf0e41)
+ packfile: delete .idx files before .pack files
We create .pack and then .idx, we consider only packfiles that have
.idx usable (those with only .pack are not ready yet), so we should
remove .idx before removing .pack for consistency.
Will merge to 'master'.
source: <20230617042624.GA562686@coredump.intra.peff.net>
source: <pull.1547.git.1687287675248.gitgitgadget@gmail.com>
* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
(merged to 'next' on 2023-06-20 at c1247fd527)
+ http: handle both "h2" and "h2h3" in curl info lines
* bc/more-git-var (2023-06-22) 3 commits
- var: add config file locations
- var: add attributes files locations
- var: add support for listing the shell
Curl library recently changed how http2 traces are shown and broke
the code to redact sensitive info header, which has been fixed.
Add more "git var" for toolsmiths to learn various locations Git is
configured with either via the configuration or hardcoded defaults.
Expecting a reroll.
source: <20230622195059.320593-1-sandals@crustytoothpaste.net>
* jc/doc-hash-object-types (2023-06-22) 1 commit
- docs: add "git hash-object -t" option's possible values
Doc update.
Expecting a reroll.
cf. <62B7F5FF-F85D-47C0-B553-F57B991D0BCC@gmail.com>
source: <pull.1533.git.git.1687394795009.gitgitgadget@gmail.com>
* jc/abort-ll-merge-with-a-signal (2023-06-23) 1 commit
(merged to 'next' on 2023-06-23 at 9c9c37e95e)
+ ll-merge: killing the external merge driver aborts the merge
When the external merge driver is killed by a signal, its output
should not be trusted as a resolution with conflicts that is
proposed by the driver, but the code did.
Will merge to 'master'.
source: <20230617051559.GD562686@coredump.intra.peff.net>
* rs/strbuf-expand-step (2023-06-18) 5 commits
- strbuf: simplify strbuf_expand_literal_cb()
- replace strbuf_expand() with strbuf_expand_step()
- replace strbuf_expand_dict_cb() with strbuf_expand_step()
- strbuf: factor out strbuf_expand_step()
- pretty: factor out expand_separator()
Code clean-up around strbuf_expand() API.
source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
source: <xmqq4jmzc91e.fsf_-_@gitster.g>
--------------------------------------------------
[Stalled]
@@ -503,6 +426,71 @@ Release tarballs are available at:
--------------------------------------------------
[Cooking]
* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
- gc: add `gc.repackFilterTo` config option
- repack: implement `--filter-to` for storing filtered out objects
- gc: add `gc.repackFilter` config option
- repack: add `--filter=<filter-spec>` option
- repack: refactor finishing pack-objects command
- repack: refactor piping an oid to a command
- t/helper: add 'find-pack' test-tool
- pack-objects: add `--print-filtered` to print omitted objects
- pack-objects: allow `--filter` without `--stdout`
"git repack" machinery learns to pay attention to the "--filter="
option.
Needs review.
source: <20230614192541.1599256-1-christian.couder@gmail.com>
* ps/revision-stdin-with-options (2023-06-15) 3 commits
- revision: handle pseudo-opts in `--stdin` mode
- revision: small readability improvement for reading from stdin
- revision: reorder `read_revisions_from_stdin()`
The set-up code for the get_revision() API now allows feeding
options like --all and --not in the --stdin mode.
Will merge to 'next'?
source: <cover.1686839572.git.ps@pks.im>
* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
(merged to 'next' on 2023-06-20 at 08e5f2a6b5)
+ commit: pass --no-divider to interpret-trailers
When "git commit --trailer=..." invokes the interpret-trailers
machinery, it knows what it feeds to interpret-trailers is a full
log message without any patch, but failed to express that by
passing the "--no-divider" option, which has been corrected.
Will merge to 'master'.
source: <20230617042624.GA562686@coredump.intra.peff.net>
* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
(merged to 'next' on 2023-06-20 at c1247fd527)
+ http: handle both "h2" and "h2h3" in curl info lines
Curl library recently changed how http2 traces are shown and broke
the code to redact sensitive info header, which has been fixed.
Will merge to 'master'.
source: <20230617051559.GD562686@coredump.intra.peff.net>
* rs/strbuf-expand-step (2023-06-18) 5 commits
- strbuf: simplify strbuf_expand_literal_cb()
- replace strbuf_expand() with strbuf_expand_step()
- replace strbuf_expand_dict_cb() with strbuf_expand_step()
- strbuf: factor out strbuf_expand_step()
- pretty: factor out expand_separator()
Code clean-up around strbuf_expand() API.
source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
* js/doc-unit-tests (2023-06-13) 1 commit
- unit tests: Add a project plan document
@@ -512,50 +500,6 @@ Release tarballs are available at:
source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
(merged to 'next' on 2023-06-16 at ebb72b9bd8)
+ CodingGuidelines: use octal escapes, not hex
Suggest to refrain from using hex literals that are non-portable
when writing printf(1) format strings.
Will merge to 'master'.
source: <20230614213145.475607-1-jonathantanmy@google.com>
* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
(merged to 'next' on 2023-06-16 at bfc01bd5e2)
+ diff-lib: honor override_submodule_config flag bit
Even when diff.ignoreSubmodules tells us to ignore submodule
changes, "git commit" with an index that already records changes to
submodules should include the submodule changes in the resulting
commit, but it did not.
Will merge to 'master'.
source: <20230614164856.3186012-2-sokcevic@google.com>
* as/dtype-compilation-fix (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 267100947e)
+ statinfo.h: move DTYPE defines from dir.h
Compilation fix for platforms without D_TYPE in struct dirent.
Will merge to 'master'.
source: <20230606205935.3183276-1-asedeno@google.com>
* la/docs-typofixes (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 56ddcb16e6)
+ docs: typofixes
Typofixes.
Will merge to 'master'.
source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
- mingw: use lowercase includes for some Windows headers
@@ -602,49 +546,6 @@ Release tarballs are available at:
source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
* rj/leakfixes (2023-06-17) 11 commits
(merged to 'next' on 2023-06-17 at 49e54a88e2)
+ tests: mark as passing with SANITIZE=leak
+ config: fix a leak in git_config_copy_or_rename_section_in_file
+ branch: fix a leak in cmd_branch
+ branch: fix a leak in setup_tracking
+ rev-parse: fix a leak with --abbrev-ref
(merged to 'next' on 2023-06-16 at d9330ea230)
+ branch: fix a leak in setup_tracking
+ branch: fix a leak in check_tracking_branch
+ branch: fix a leak in inherit_tracking
+ branch: fix a leak in dwim_and_setup_tracking
+ remote: fix a leak in query_matches_negative_refspec
+ config: fix a leak in git_config_copy_or_rename_section_in_file
Leakfixes
Will merge to 'master'.
source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
(merged to 'next' on 2023-06-16 at 6bb4425334)
+ run-command: report exec error even on ENOENT
+ t1800: loosen matching of error message for bad shebang
Simplify error message when run-command fails to start a command.
Will merge to 'master'.
source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
* sl/worktree-sparse (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at ca0a7edcc5)
+ worktree: integrate with sparse-index
"git worktree" learned to work better with sparse index feature.
Will merge to 'master'.
source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
* tb/collect-pack-filenames-fix (2023-06-12) 1 commit
(merged to 'next' on 2023-06-20 at abcc6892c8)
+ builtin/repack.c: only collect fully-formed packs
@@ -656,53 +557,6 @@ Release tarballs are available at:
source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 6546fee734)
+ pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
Gracefully deal with a stale MIDX file that lists a packfile that
no longer exists.
Will merge to 'master'.
source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
(merged to 'next' on 2023-06-16 at 19770e970a)
+ t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
Test update.
Will merge to 'master'.
source: <20230606214707.55739-1-tmz@pobox.com>
* ps/cat-file-null-output (2023-06-12) 5 commits
(merged to 'next' on 2023-06-15 at e841ad2be5)
+ cat-file: add option '-Z' that delimits input and output with NUL
+ cat-file: simplify reading from standard input
+ strbuf: provide CRLF-aware helper to read until a specified delimiter
+ t1006: modernize test style to use `test_cmp`
+ t1006: don't strip timestamps from expected results
"git cat-file --batch" and friends learned "-Z" that uses NUL
delimiter for both input and output.
Will merge to 'master'.
source: <cover.1686028409.git.ps@pks.im>
* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
(merged to 'next' on 2023-06-15 at 377b9f9a00)
+ add: test use of brackets when color is disabled
+ add: check color.ui for interactive add
The reimplemented "git add -i" did not honor color.ui configuration.
Will merge to 'master'.
source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
* ks/ref-filter-signature (2023-06-06) 2 commits
- ref-filter: add new "signature" atom
- t/lib-gpg: introduce new prereq GPG2
@@ -714,20 +568,6 @@ Release tarballs are available at:
source: <20230604185815.15761-1-five231003@gmail.com>
* ds/disable-replace-refs (2023-06-12) 3 commits
(merged to 'next' on 2023-06-15 at e7baddb745)
+ repository: create read_replace_refs setting
+ replace-objects: create wrapper around setting
+ repository: create disable_replace_refs()
(this branch uses tb/pack-bitmap-traversal-with-boundary.)
Introduce a mechanism to disable replace refs globally and per
repository.
Will merge to 'master'.
source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
* jt/path-filter-fix (2023-06-13) 4 commits
- commit-graph: new filter ver. that fixes murmur3
- repo-settings: introduce commitgraph.changedPathsVersion
@@ -766,26 +606,6 @@ Release tarballs are available at:
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
* ja/worktree-orphan (2023-05-17) 8 commits
(merged to 'next' on 2023-06-15 at 16bb552b79)
+ 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: cleanup created worktree in test
+ worktree add: include -B in usage docs
Originally merged to 'next' on 2023-06-14
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Will merge to 'master'.
source: <20230517214711.12467-1-jacobabel@nullpo.dev>
* tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits
- ls-refs.c: avoid enumerating hidden refs where possible
- upload-pack.c: avoid enumerating hidden refs where possible
@@ -806,12 +626,11 @@ Release tarballs are available at:
Enumerating refs in the packed-refs file, while excluding refs that
match certain patterns, has been optimized.
source: <cover.1687270849.git.me@ttaylorr.com>
* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
(merged to 'next' on 2023-06-15 at 76ebce0b7a)
* en/header-split-cache-h-part-3 (2023-06-21) 28 commits
(merged to 'next' on 2023-06-23 at 84ad22bf36)
+ fsmonitor-ll.h: split this header out of fsmonitor.h
+ hash-ll, hashmap: move oidhash() to hash-ll
+ object-store-ll.h: split this header out of object-store.h
@@ -840,14 +659,10 @@ Release tarballs are available at:
+ init-db, clone: change unnecessary global into passed parameter
+ init-db: remove unnecessary global variable
+ init-db: document existing bug with core.bare in template config
+ Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
(this branch is used by js/cmake-wo-cache-h.)
Originally merged to 'next' on 2023-06-13
Header files cleanup.
Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h
Will merge to 'master'.
source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
@@ -871,19 +686,6 @@ Release tarballs are available at:
source: <20230602102533.876905-1-christian.couder@gmail.com>
* tb/gc-recent-object-hook (2023-06-12) 2 commits
(merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
+ gc: introduce `gc.recentObjectsHook`
+ reachable.c: extract `obj_is_recent()`
"git pack-objects" learned to invoke a new hook program that
enumerates extra objects to be used as anchoring points to keep
otherwise unreachable objects in cruft packs.
Will merge to 'master'.
source: <cover.1686178684.git.me@ttaylorr.com>
* ob/revert-of-revert (2023-05-05) 1 commit
- sequencer: beautify subject of reverts of reverts
@@ -909,31 +711,18 @@ Release tarballs are available at:
source: <20230606194720.2053551-1-calvinwan@google.com>
* tl/notes-separator (2023-04-28) 6 commits
* tl/notes-separator (2023-06-21) 7 commits
- notes: introduce "--no-separator" option
- 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'
(this branch is used by jc/notes-separator-fix.)
'git notes append' was taught '--separator' to specify string to insert
between paragraphs.
Expecting a reroll.
cf. <20230615071314.GC1460739@coredump.intra.peff.net>
source: <cover.1682671758.git.dyroneteng@gmail.com>
* jc/notes-separator-fix (2023-06-13) 1 commit
- notes: do not access before the beginning of an array
(this branch uses tl/notes-separator.)
Fix to tl/notes-separator topic.
Will drop once tl/notes-separator gets updated.
source: <cover.1682671758.git.dyroneteng@gmail.com>
source: <cover.1685174011.git.dyroneteng@gmail.com>
* pw/rebase-i-after-failure (2023-04-21) 6 commits
@@ -952,23 +741,6 @@ Release tarballs are available at:
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
+ pack-bitmap.c: use commit boundary during bitmap traversal
+ pack-bitmap.c: extract `fill_in_bitmap()`
+ object: add object_array initializer helper function
(this branch is used by ds/disable-replace-refs.)
Originally merged to 'next' on 2023-06-15
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.
Will merge to 'master'.
source: <cover.1683567065.git.me@ttaylorr.com>
--------------------------------------------------
[Discarded]
@@ -998,3 +770,21 @@ Release tarballs are available at:
Retracted for now.
cf. <ZJCI6FHtbuOKPlV1@nand.local>
source: <cover.1679342296.git.me@ttaylorr.com>
* js/cmake-wo-cache-h (2023-06-15) 1 commit
. cmake: adapt to `cache.h` being no more
Build fix in en/header-split-cache-h-part-3 topic.
Ejected out of 'next' and made into a part of en/header-split-cache-h-part-3
source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
* jc/notes-separator-fix (2023-06-13) 7 commits
. notes: do not access before the beginning of an array
Fix to tl/notes-separator topic.
Discarded as the updated base topic should not require it anymore.
source: <cover.1682671758.git.dyroneteng@gmail.com>