@matheusbsbs / matheus-bagliano / commits / bb016b8952

What's cooking (2023/06 #06)

Junio C Hamano committed Jun 23, 2023 at 13:47 UTC bb016b89527d5911d09eec54e9758ef316cbab49
1 file changed +249 -459
whats-cooking.txt
+249 -459
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jun 2023, #05; Tue, 20)
3 -X-master-at: 6640c2d06d112675426cf436f0594f0e8c614848
4 -X-next-at: a1a0a3961aa073b8353158c01d6552ef94ac663d
2 +Subject: What's cooking in git.git (Jun 2023, #06; Fri, 23)
3 +X-master-at: 6ff334181cfb6485d3ba50843038209a2a253907
4 +X-next-at: 577bbd8c9fd2f098bfa6e5dc606afb1b1ce7a55e
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Jun 2023, #05; Tue, 20)
7 +What's cooking in git.git (Jun 2023, #06; Fri, 23)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -48,323 +48,246 @@ Release tarballs are available at:
48 --------------------------------------------------
49 [Graduated to 'master']
50
51 -* jc/test-modernization (2023-05-19) 20 commits
52 - (merged to 'next' on 2023-06-15 at 811ac3f7ad)
53 - + t7101-reset-empty-subdirs: modernize test format
54 - + t6050-replace: modernize test format
55 - + t5306-pack-nobase: modernize test format
56 - + t5303-pack-corruption-resilience: modernize test format
57 - + t5301-sliding-window: modernize test format
58 - + t5300-pack-object: modernize test format
59 - + t4206-log-follow-harder-copies: modernize test format
60 - + t4202-log: modernize test format
61 - + t4004-diff-rename-symlink: modernize test format
62 - + t4003-diff-rename-1: modernize test format
63 - + t4002-diff-basic: modernize test format
64 - + t3903-stash: modernize test format
65 - + t3700-add: modernize test format
66 - + t3500-cherry: modernize test format
67 - + t1006-cat-file: modernize test format
68 - + t1002-read-tree-m-u-2way: modernize test format
69 - + t1001-read-tree-m-2way: modernize test format
70 - + t3210-pack-refs: modernize test format
71 - + t0030-stripspace: modernize test format
72 - + t0000-basic: modernize test format
73 - (this branch is used by jc/test-modernization-2.)
74 -
75 - Originally merged to 'next' on 2023-06-13
76 - source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
77 -
78 -
79 -* jc/test-modernization-2 (2023-05-23) 10 commits
80 - (merged to 'next' on 2023-06-15 at 01df673682)
81 - + t9400-git-cvsserver-server: modernize test format
82 - + t9200-git-cvsexportcommit: modernize test format
83 - + t9104-git-svn-follow-parent: modernize test format
84 - + t9100-git-svn-basic: modernize test format
85 - + t7700-repack: modernize test format
86 - + t7600-merge: modernize test format
87 - + t7508-status: modernize test format
88 - + t7201-co: modernize test format
89 - + t7111-reset-table: modernize test format
90 - + t7110-reset-merge: modernize test format
91 - (this branch uses jc/test-modernization.)
92 -
93 - Originally merged to 'next' on 2023-06-13
94 -
95 - Test style updates.
96 - source: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
97 -
98 -
99 -* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits
100 - (merged to 'next' on 2023-06-15 at 268459fc6a)
101 - + ci: drop linux-clang job
102 - + ci: run ASan/UBSan in a single job
103 - + ci: use clang for ASan/UBSan checks
104 -
105 - Originally merged to 'next' on 2023-06-12
106 -
107 - Clang's sanitizer implementation seems to work better than GCC's.
108 - source: <20230601180220.GA4167745@coredump.intra.peff.net>
109 -
110 -
111 -* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits
112 - (merged to 'next' on 2023-06-15 at 6848e0b8e6)
113 - + diff: detect pathspec magic not supported by --follow
114 - + diff: factor out --follow pathspec check
115 - + pathspec: factor out magic-to-name function
116 -
117 - Originally merged to 'next' on 2023-06-13
118 -
119 - "git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
120 - source: <20230601173724.GA4158369@coredump.intra.peff.net>
121 -
122 -
123 -* kh/use-default-notes-doc (2023-06-06) 2 commits
124 - (merged to 'next' on 2023-06-15 at f25ced157e)
125 - + notes: move the documentation to the struct
126 - + notes: update documentation for `use_default_notes`
127 -
128 - Originally merged to 'next' on 2023-06-13
129 -
130 - Doc update.
131 - source: <cover.1685958731.git.code@khaugsbakk.name>
132 -
133 -
134 -* la/doc-interpret-trailers (2023-06-14) 9 commits
135 - (merged to 'next' on 2023-06-15 at 6ff4a2b913)
136 - + doc: trailer: add more examples in DESCRIPTION
137 - + doc: trailer: mention 'key' in DESCRIPTION
138 - + doc: trailer.<token>.command: emphasize deprecation
139 - + doc: trailer: use angle brackets for <token> and <value>
140 - + doc: trailer: remove redundant phrasing
141 - + doc: trailer: examples: avoid the word "message" by itself
142 - + doc: trailer: drop "commit message part" phrasing
143 - + doc: trailer: swap verb order
144 - + doc: trailer: fix grammar
51 +* as/dtype-compilation-fix (2023-06-12) 1 commit
52 + (merged to 'next' on 2023-06-16 at 267100947e)
53 + + statinfo.h: move DTYPE defines from dir.h
54
146 - Originally merged to 'next' on 2023-06-14
55 + Compilation fix for platforms without D_TYPE in struct dirent.
56 + source: <20230606205935.3183276-1-asedeno@google.com>
57
148 - Doc update.
149 - source: <pull.1506.v4.git.git.1686797630.gitgitgadget@gmail.com>
58
59 +* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
60 + (merged to 'next' on 2023-06-15 at 377b9f9a00)
61 + + add: test use of brackets when color is disabled
62 + + add: check color.ui for interactive add
63
152 -* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit
153 - (merged to 'next' on 2023-06-15 at 62e19d66fb)
154 - + commit-reach: fix memory leak in get_reachable_subset()
64 + The reimplemented "git add -i" did not honor color.ui configuration.
65 + source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
66
156 - Originally merged to 'next' on 2023-06-12
67
158 - Plug memory leak.
159 - source: <20230603002819.1122129-1-mh@glandium.org>
68 +* ds/disable-replace-refs (2023-06-12) 3 commits
69 + (merged to 'next' on 2023-06-15 at e7baddb745)
70 + + repository: create read_replace_refs setting
71 + + replace-objects: create wrapper around setting
72 + + repository: create disable_replace_refs()
73 + (this branch uses tb/pack-bitmap-traversal-with-boundary.)
74
75 + Introduce a mechanism to disable replace refs globally and per
76 + repository.
77 + source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
78
162 -* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits
163 - (merged to 'next' on 2023-06-15 at ebe3216719)
164 - + completion: complete AUTO_MERGE
165 - + Documentation: document AUTO_MERGE
166 - + git-merge.txt: modernize word choice in "True merge" section
167 - + completion: complete REVERT_HEAD and BISECT_HEAD
168 - + revisions.txt: document more special refs
169 - + revisions.txt: use description list for special refs
79
171 - Originally merged to 'next' on 2023-06-13
80 +* gc/discover-not-setup (2023-06-16) 1 commit
81 + (merged to 'next' on 2023-06-16 at 27d1cd2a1b)
82 + + setup.c: don't setup in discover_git_directory()
83
173 - Document more pseudo-refs and teach the command line completion
174 - machinery to complete AUTO_MERGE.
175 - source: <pull.1515.v2.git.1684783741.gitgitgadget@gmail.com>
84 + discover_git_directory() no longer touches the_repository.
85 + source: <pull.1526.git.git.1686771358484.gitgitgadget@gmail.com>
86
87
178 -* ps/fetch-cleanups (2023-05-17) 9 commits
179 - (merged to 'next' on 2023-06-15 at 33878153a5)
180 - + fetch: use `fetch_config` to store "submodule.fetchJobs" value
181 - + fetch: use `fetch_config` to store "fetch.parallel" value
182 - + fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
183 - + fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
184 - + fetch: use `fetch_config` to store "fetch.pruneTags" value
185 - + fetch: use `fetch_config` to store "fetch.prune" value
186 - + fetch: pass through `fetch_config` directly
187 - + fetch: drop unneeded NULL-check for `remote_ref`
188 - + fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
88 +* ja/worktree-orphan (2023-05-17) 8 commits
89 + (merged to 'next' on 2023-06-15 at 16bb552b79)
90 + + worktree add: emit warn when there is a bad HEAD
91 + + worktree add: extend DWIM to infer --orphan
92 + + worktree add: introduce "try --orphan" hint
93 + + worktree add: add --orphan flag
94 + + t2400: add tests to verify --quiet
95 + + t2400: refactor "worktree add" opt exclusion tests
96 + + t2400: cleanup created worktree in test
97 + + worktree add: include -B in usage docs
98
190 - Originally merged to 'next' on 2023-06-12
99 + Originally merged to 'next' on 2023-06-14
100
192 - Code clean-up.
193 - cf. <20230519002128.GD2442034@coredump.intra.peff.net>
194 - source: <cover.1684324059.git.ps@pks.im>
101 + 'git worktree add' learned how to create a worktree based on an
102 + orphaned branch with `--orphan`.
103 + source: <20230517214711.12467-1-jacobabel@nullpo.dev>
104
105
197 -* tb/submodule-null-deref-fix (2023-05-25) 1 commit
198 - (merged to 'next' on 2023-06-15 at 8cb6a7710a)
199 - + builtin/submodule--helper.c: handle missing submodule URLs
106 +* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
107 + (merged to 'next' on 2023-06-16 at bfc01bd5e2)
108 + + diff-lib: honor override_submodule_config flag bit
109
201 - Originally merged to 'next' on 2023-06-13
110 + Even when diff.ignoreSubmodules tells us to ignore submodule
111 + changes, "git commit" with an index that already records changes to
112 + submodules should include the submodule changes in the resulting
113 + commit, but it did not.
114 + source: <20230614164856.3186012-2-sokcevic@google.com>
115
203 - "git submodule" code trusted the data coming from the config (and
204 - the in-tree .gitmodules file) too much without validating, leading
205 - to NULL dereference if the user mucks with a repository (e.g.
206 - submodule.<name>.url is removed). This has been corrected.
207 - source: <ae6cf3fa461b85e346f034371dae56a2790dfa20.1684957882.git.me@ttaylorr.com>
116
117 +* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
118 + (merged to 'next' on 2023-06-16 at ebb72b9bd8)
119 + + CodingGuidelines: use octal escapes, not hex
120
210 -* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit
211 - (merged to 'next' on 2023-06-15 at 4e52ad2fb3)
212 - + surround %s with quotes when failed to lookup commit
121 + Suggest to refrain from using hex literals that are non-portable
122 + when writing printf(1) format strings.
123 + source: <20230614213145.475607-1-jonathantanmy@google.com>
124
214 - Originally merged to 'next' on 2023-06-12
125
216 - Error message fix.
217 - source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>
126 +* la/docs-typofixes (2023-06-12) 1 commit
127 + (merged to 'next' on 2023-06-16 at 56ddcb16e6)
128 + + docs: typofixes
129
130 + Typofixes.
131 + source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
132
220 -* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit
221 - (merged to 'next' on 2023-06-15 at 2d2446ff97)
222 - + trace2 tests: fix PTHREADS prereq
133
224 - Originally merged to 'next' on 2023-06-12
134 +* mh/credential-erase-improvements (2023-06-15) 2 commits
135 + (merged to 'next' on 2023-06-16 at 5a3ed25303)
136 + + credential: erase all matching credentials
137 + + credential: avoid erasing distinct password
138
226 - Test fix.
227 - source: <20230525031218.3554586-1-tmz@pobox.com>
139 + Will merge to 'master'.
140 + cf. <20230615212116.GA39325@coredump.intra.peff.net>
141 + source: <pull.1525.v4.git.git.1686856773.gitgitgadget@gmail.com>
142
143
230 -* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit
231 - (merged to 'next' on 2023-06-15 at dd97dd32f3)
232 - + t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
144 +* ps/cat-file-null-output (2023-06-12) 5 commits
145 + (merged to 'next' on 2023-06-15 at e841ad2be5)
146 + + cat-file: add option '-Z' that delimits input and output with NUL
147 + + cat-file: simplify reading from standard input
148 + + strbuf: provide CRLF-aware helper to read until a specified delimiter
149 + + t1006: modernize test style to use `test_cmp`
150 + + t1006: don't strip timestamps from expected results
151
234 - Originally merged to 'next' on 2023-06-12
152 + "git cat-file --batch" and friends learned "-Z" that uses NUL
153 + delimiter for both input and output.
154 + source: <cover.1686028409.git.ps@pks.im>
155
236 - Test fix.
237 - source: <20230525031026.3554406-1-tmz@pobox.com>
156
157 +* rj/leakfixes (2023-06-17) 11 commits
158 + (merged to 'next' on 2023-06-17 at 49e54a88e2)
159 + + tests: mark as passing with SANITIZE=leak
160 + + config: fix a leak in git_config_copy_or_rename_section_in_file
161 + + branch: fix a leak in cmd_branch
162 + + branch: fix a leak in setup_tracking
163 + + rev-parse: fix a leak with --abbrev-ref
164 + (merged to 'next' on 2023-06-16 at d9330ea230)
165 + + branch: fix a leak in setup_tracking
166 + + branch: fix a leak in check_tracking_branch
167 + + branch: fix a leak in inherit_tracking
168 + + branch: fix a leak in dwim_and_setup_tracking
169 + + remote: fix a leak in query_matches_negative_refspec
170 + + config: fix a leak in git_config_copy_or_rename_section_in_file
171
240 -* vd/worktree-config-is-per-repository (2023-05-26) 3 commits
241 - (merged to 'next' on 2023-06-15 at 6301770cd6)
242 - + repository: move 'repository_format_worktree_config' to repo scope
243 - + config: pass 'repo' directly to 'config_with_options()'
244 - + config: use gitdir to get worktree config
172 + Leakfixes
173 + source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
174 + source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
175
246 - Originally merged to 'next' on 2023-06-13
176
248 - The value of config.worktree is per-repository, but has been kept
249 - in a singleton global variable per process. This has been OK as
250 - most Git operations interacted with a single repository at a time,
251 - but not right for operations like recursive "grep" that want to
252 - access multiple repositories from a single process without forking.
177 +* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit
178 + (merged to 'next' on 2023-06-16 at 472c7f55c9)
179 + + ls-tree: fix documentation of %x format placeholder
180
254 - The global variable has been eliminated and made into a member in
255 - the per-repository data structure.
256 - cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>
257 - cf. <kl6lr0qwno2q.fsf@chooglen-macbookpro.roam.corp.google.com>
258 - source: <pull.1536.v2.git.1685064781.gitgitgadget@gmail.com>
181 + Doc update.
182 + source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>
183
260 ---------------------------------------------------
261 -[New Topics]
184
263 -* gc/discover-not-setup (2023-06-16) 1 commit
264 - (merged to 'next' on 2023-06-16 at 27d1cd2a1b)
265 - + setup.c: don't setup in discover_git_directory()
185 +* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
186 + (merged to 'next' on 2023-06-16 at 6bb4425334)
187 + + run-command: report exec error even on ENOENT
188 + + t1800: loosen matching of error message for bad shebang
189
267 - discover_git_directory() no longer touches the_repository.
190 + Simplify error message when run-command fails to start a command.
191 + source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
192
269 - Will merge to 'master'.
270 - source: <pull.1526.git.git.1686771358484.gitgitgadget@gmail.com>
193
194 +* sl/worktree-sparse (2023-06-12) 1 commit
195 + (merged to 'next' on 2023-06-16 at ca0a7edcc5)
196 + + worktree: integrate with sparse-index
197
273 -* mh/credential-erase-improvements (2023-06-15) 2 commits
274 - (merged to 'next' on 2023-06-16 at 5a3ed25303)
275 - + credential: erase all matching credentials
276 - + credential: avoid erasing distinct password
198 + "git worktree" learned to work better with sparse index feature.
199 + source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
200
278 - Will merge to 'master'.
279 - cf. <20230615212116.GA39325@coredump.intra.peff.net>
280 - source: <pull.1525.v4.git.git.1686856773.gitgitgadget@gmail.com>
201
202 +* tb/gc-recent-object-hook (2023-06-12) 2 commits
203 + (merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
204 + + gc: introduce `gc.recentObjectsHook`
205 + + reachable.c: extract `obj_is_recent()`
206
283 -* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
284 - - gc: add `gc.repackFilterTo` config option
285 - - repack: implement `--filter-to` for storing filtered out objects
286 - - gc: add `gc.repackFilter` config option
287 - - repack: add `--filter=<filter-spec>` option
288 - - repack: refactor finishing pack-objects command
289 - - repack: refactor piping an oid to a command
290 - - t/helper: add 'find-pack' test-tool
291 - - pack-objects: add `--print-filtered` to print omitted objects
292 - - pack-objects: allow `--filter` without `--stdout`
207 + "git pack-objects" learned to invoke a new hook program that
208 + enumerates extra objects to be used as anchoring points to keep
209 + otherwise unreachable objects in cruft packs.
210 + source: <cover.1686178684.git.me@ttaylorr.com>
211
294 - "git repack" machinery learns to pay attention to the "--filter="
295 - option.
212
297 - Needs review.
298 - source: <20230614192541.1599256-1-christian.couder@gmail.com>
213 +* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
214 + (merged to 'next' on 2023-06-16 at 6546fee734)
215 + + pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
216
217 + Gracefully deal with a stale MIDX file that lists a packfile that
218 + no longer exists.
219 + source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
220
301 -* js/cmake-wo-cache-h (2023-06-15) 1 commit
302 - (merged to 'next' on 2023-06-16 at b138273e7e)
303 - + cmake: adapt to `cache.h` being no more
304 - (this branch uses en/header-split-cache-h-part-3.)
221
306 - Build fix in en/header-split-cache-h-part-3 topic.
222 +* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
223 + + pack-bitmap.c: use commit boundary during bitmap traversal
224 + + pack-bitmap.c: extract `fill_in_bitmap()`
225 + + object: add object_array initializer helper function
226 + (this branch is used by ds/disable-replace-refs.)
227
308 - Will merge to 'master'.
309 - source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
228 + Originally merged to 'next' on 2023-06-15
229
230 + The object traversal using reachability bitmap done by
231 + "pack-object" has been tweaked to take advantage of the fact that
232 + using "boundary" commits as representative of all the uninteresting
233 + ones can save quite a lot of object enumeration.
234 + source: <cover.1683567065.git.me@ttaylorr.com>
235
312 -* ps/revision-stdin-with-options (2023-06-15) 3 commits
313 - - revision: handle pseudo-opts in `--stdin` mode
314 - - revision: small readability improvement for reading from stdin
315 - - revision: reorder `read_revisions_from_stdin()`
236
317 - The set-up code for the get_revision() API now allows feeding
318 - options like --all and --not in the --stdin mode.
237 +* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
238 + (merged to 'next' on 2023-06-16 at 19770e970a)
239 + + t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
240
320 - Will merge to 'next'?
321 - source: <cover.1686839572.git.ps@pks.im>
241 + Test update.
242 + source: <20230606214707.55739-1-tmz@pobox.com>
243
244 +--------------------------------------------------
245 +[New Topics]
246
324 -* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit
325 - (merged to 'next' on 2023-06-16 at 472c7f55c9)
326 - + ls-tree: fix documentation of %x format placeholder
247 +* ds/remove-idx-before-pack (2023-06-20) 1 commit
248 + (merged to 'next' on 2023-06-23 at fa97bf0e41)
249 + + packfile: delete .idx files before .pack files
250
328 - Doc update.
251 + We create .pack and then .idx, we consider only packfiles that have
252 + .idx usable (those with only .pack are not ready yet), so we should
253 + remove .idx before removing .pack for consistency.
254
255 Will merge to 'master'.
331 - source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>
256 + source: <pull.1547.git.1687287675248.gitgitgadget@gmail.com>
257
258
334 -* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
335 - (merged to 'next' on 2023-06-20 at 08e5f2a6b5)
336 - + commit: pass --no-divider to interpret-trailers
259 +* bc/more-git-var (2023-06-22) 3 commits
260 + - var: add config file locations
261 + - var: add attributes files locations
262 + - var: add support for listing the shell
263
338 - When "git commit --trailer=..." invokes the interpret-trailers
339 - machinery, it knows what it feeds to interpret-trailers is a full
340 - log message without any patch, but failed to express that by
341 - passing the "--no-divider" option, which has been corrected.
264 + Add more "git var" for toolsmiths to learn various locations Git is
265 + configured with either via the configuration or hardcoded defaults.
266
343 - Will merge to 'master'.
344 - source: <20230617042624.GA562686@coredump.intra.peff.net>
267 + Expecting a reroll.
268 + source: <20230622195059.320593-1-sandals@crustytoothpaste.net>
269
270
347 -* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
348 - (merged to 'next' on 2023-06-20 at c1247fd527)
349 - + http: handle both "h2" and "h2h3" in curl info lines
271 +* jc/doc-hash-object-types (2023-06-22) 1 commit
272 + - docs: add "git hash-object -t" option's possible values
273
351 - Curl library recently changed how http2 traces are shown and broke
352 - the code to redact sensitive info header, which has been fixed.
274 + Doc update.
275
354 - Will merge to 'master'.
355 - source: <20230617051559.GD562686@coredump.intra.peff.net>
276 + Expecting a reroll.
277 + cf. <62B7F5FF-F85D-47C0-B553-F57B991D0BCC@gmail.com>
278 + source: <pull.1533.git.git.1687394795009.gitgitgadget@gmail.com>
279
280
358 -* rs/strbuf-expand-step (2023-06-18) 5 commits
359 - - strbuf: simplify strbuf_expand_literal_cb()
360 - - replace strbuf_expand() with strbuf_expand_step()
361 - - replace strbuf_expand_dict_cb() with strbuf_expand_step()
362 - - strbuf: factor out strbuf_expand_step()
363 - - pretty: factor out expand_separator()
281 +* jc/abort-ll-merge-with-a-signal (2023-06-23) 1 commit
282 + (merged to 'next' on 2023-06-23 at 9c9c37e95e)
283 + + ll-merge: killing the external merge driver aborts the merge
284
365 - Code clean-up around strbuf_expand() API.
285 + When the external merge driver is killed by a signal, its output
286 + should not be trusted as a resolution with conflicts that is
287 + proposed by the driver, but the code did.
288
367 - source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
289 + Will merge to 'master'.
290 + source: <xmqq4jmzc91e.fsf_-_@gitster.g>
291
292 --------------------------------------------------
293 [Stalled]
@@ -503,57 +426,78 @@ Release tarballs are available at:
426 --------------------------------------------------
427 [Cooking]
428
506 -* js/doc-unit-tests (2023-06-13) 1 commit
507 - - unit tests: Add a project plan document
429 +* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits
430 + - gc: add `gc.repackFilterTo` config option
431 + - repack: implement `--filter-to` for storing filtered out objects
432 + - gc: add `gc.repackFilter` config option
433 + - repack: add `--filter=<filter-spec>` option
434 + - repack: refactor finishing pack-objects command
435 + - repack: refactor piping an oid to a command
436 + - t/helper: add 'find-pack' test-tool
437 + - pack-objects: add `--print-filtered` to print omitted objects
438 + - pack-objects: allow `--filter` without `--stdout`
439
509 - Process to add some form of low-level unit tests has started.
440 + "git repack" machinery learns to pay attention to the "--filter="
441 + option.
442
511 - Comments? Filling in blanks?
512 - source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
443 + Needs review.
444 + source: <20230614192541.1599256-1-christian.couder@gmail.com>
445
446
515 -* jt/doc-use-octal-with-printf (2023-06-14) 1 commit
516 - (merged to 'next' on 2023-06-16 at ebb72b9bd8)
517 - + CodingGuidelines: use octal escapes, not hex
447 +* ps/revision-stdin-with-options (2023-06-15) 3 commits
448 + - revision: handle pseudo-opts in `--stdin` mode
449 + - revision: small readability improvement for reading from stdin
450 + - revision: reorder `read_revisions_from_stdin()`
451
519 - Suggest to refrain from using hex literals that are non-portable
520 - when writing printf(1) format strings.
452 + The set-up code for the get_revision() API now allows feeding
453 + options like --all and --not in the --stdin mode.
454
522 - Will merge to 'master'.
523 - source: <20230614213145.475607-1-jonathantanmy@google.com>
455 + Will merge to 'next'?
456 + source: <cover.1686839572.git.ps@pks.im>
457
458
526 -* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
527 - (merged to 'next' on 2023-06-16 at bfc01bd5e2)
528 - + diff-lib: honor override_submodule_config flag bit
459 +* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit
460 + (merged to 'next' on 2023-06-20 at 08e5f2a6b5)
461 + + commit: pass --no-divider to interpret-trailers
462
530 - Even when diff.ignoreSubmodules tells us to ignore submodule
531 - changes, "git commit" with an index that already records changes to
532 - submodules should include the submodule changes in the resulting
533 - commit, but it did not.
463 + When "git commit --trailer=..." invokes the interpret-trailers
464 + machinery, it knows what it feeds to interpret-trailers is a full
465 + log message without any patch, but failed to express that by
466 + passing the "--no-divider" option, which has been corrected.
467
468 Will merge to 'master'.
536 - source: <20230614164856.3186012-2-sokcevic@google.com>
469 + source: <20230617042624.GA562686@coredump.intra.peff.net>
470
471
539 -* as/dtype-compilation-fix (2023-06-12) 1 commit
540 - (merged to 'next' on 2023-06-16 at 267100947e)
541 - + statinfo.h: move DTYPE defines from dir.h
472 +* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit
473 + (merged to 'next' on 2023-06-20 at c1247fd527)
474 + + http: handle both "h2" and "h2h3" in curl info lines
475
543 - Compilation fix for platforms without D_TYPE in struct dirent.
476 + Curl library recently changed how http2 traces are shown and broke
477 + the code to redact sensitive info header, which has been fixed.
478
479 Will merge to 'master'.
546 - source: <20230606205935.3183276-1-asedeno@google.com>
480 + source: <20230617051559.GD562686@coredump.intra.peff.net>
481
482
549 -* la/docs-typofixes (2023-06-12) 1 commit
550 - (merged to 'next' on 2023-06-16 at 56ddcb16e6)
551 - + docs: typofixes
483 +* rs/strbuf-expand-step (2023-06-18) 5 commits
484 + - strbuf: simplify strbuf_expand_literal_cb()
485 + - replace strbuf_expand() with strbuf_expand_step()
486 + - replace strbuf_expand_dict_cb() with strbuf_expand_step()
487 + - strbuf: factor out strbuf_expand_step()
488 + - pretty: factor out expand_separator()
489
553 - Typofixes.
490 + Code clean-up around strbuf_expand() API.
491 + source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>
492
555 - Will merge to 'master'.
556 - source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
493 +
494 +* js/doc-unit-tests (2023-06-13) 1 commit
495 + - unit tests: Add a project plan document
496 +
497 + Process to add some form of low-level unit tests has started.
498 +
499 + Comments? Filling in blanks?
500 + source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
501
502
503 * mh/mingw-case-sensitive-build (2023-06-12) 1 commit
@@ -602,49 +546,6 @@ Release tarballs are available at:
546 source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
547
548
605 -* rj/leakfixes (2023-06-17) 11 commits
606 - (merged to 'next' on 2023-06-17 at 49e54a88e2)
607 - + tests: mark as passing with SANITIZE=leak
608 - + config: fix a leak in git_config_copy_or_rename_section_in_file
609 - + branch: fix a leak in cmd_branch
610 - + branch: fix a leak in setup_tracking
611 - + rev-parse: fix a leak with --abbrev-ref
612 - (merged to 'next' on 2023-06-16 at d9330ea230)
613 - + branch: fix a leak in setup_tracking
614 - + branch: fix a leak in check_tracking_branch
615 - + branch: fix a leak in inherit_tracking
616 - + branch: fix a leak in dwim_and_setup_tracking
617 - + remote: fix a leak in query_matches_negative_refspec
618 - + config: fix a leak in git_config_copy_or_rename_section_in_file
619 -
620 - Leakfixes
621 -
622 - Will merge to 'master'.
623 - source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>
624 - source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
625 -
626 -
627 -* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
628 - (merged to 'next' on 2023-06-16 at 6bb4425334)
629 - + run-command: report exec error even on ENOENT
630 - + t1800: loosen matching of error message for bad shebang
631 -
632 - Simplify error message when run-command fails to start a command.
633 -
634 - Will merge to 'master'.
635 - source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
636 -
637 -
638 -* sl/worktree-sparse (2023-06-12) 1 commit
639 - (merged to 'next' on 2023-06-16 at ca0a7edcc5)
640 - + worktree: integrate with sparse-index
641 -
642 - "git worktree" learned to work better with sparse index feature.
643 -
644 - Will merge to 'master'.
645 - source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
646 -
647 -
549 * tb/collect-pack-filenames-fix (2023-06-12) 1 commit
550 (merged to 'next' on 2023-06-20 at abcc6892c8)
551 + builtin/repack.c: only collect fully-formed packs
@@ -656,53 +557,6 @@ Release tarballs are available at:
557 source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
558
559
659 -* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
660 - (merged to 'next' on 2023-06-16 at 6546fee734)
661 - + pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
662 -
663 - Gracefully deal with a stale MIDX file that lists a packfile that
664 - no longer exists.
665 -
666 - Will merge to 'master'.
667 - source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
668 -
669 -
670 -* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
671 - (merged to 'next' on 2023-06-16 at 19770e970a)
672 - + t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
673 -
674 - Test update.
675 -
676 - Will merge to 'master'.
677 - source: <20230606214707.55739-1-tmz@pobox.com>
678 -
679 -
680 -* ps/cat-file-null-output (2023-06-12) 5 commits
681 - (merged to 'next' on 2023-06-15 at e841ad2be5)
682 - + cat-file: add option '-Z' that delimits input and output with NUL
683 - + cat-file: simplify reading from standard input
684 - + strbuf: provide CRLF-aware helper to read until a specified delimiter
685 - + t1006: modernize test style to use `test_cmp`
686 - + t1006: don't strip timestamps from expected results
687 -
688 - "git cat-file --batch" and friends learned "-Z" that uses NUL
689 - delimiter for both input and output.
690 -
691 - Will merge to 'master'.
692 - source: <cover.1686028409.git.ps@pks.im>
693 -
694 -
695 -* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
696 - (merged to 'next' on 2023-06-15 at 377b9f9a00)
697 - + add: test use of brackets when color is disabled
698 - + add: check color.ui for interactive add
699 -
700 - The reimplemented "git add -i" did not honor color.ui configuration.
701 -
702 - Will merge to 'master'.
703 - source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
704 -
705 -
560 * ks/ref-filter-signature (2023-06-06) 2 commits
561 - ref-filter: add new "signature" atom
562 - t/lib-gpg: introduce new prereq GPG2
@@ -714,20 +568,6 @@ Release tarballs are available at:
568 source: <20230604185815.15761-1-five231003@gmail.com>
569
570
717 -* ds/disable-replace-refs (2023-06-12) 3 commits
718 - (merged to 'next' on 2023-06-15 at e7baddb745)
719 - + repository: create read_replace_refs setting
720 - + replace-objects: create wrapper around setting
721 - + repository: create disable_replace_refs()
722 - (this branch uses tb/pack-bitmap-traversal-with-boundary.)
723 -
724 - Introduce a mechanism to disable replace refs globally and per
725 - repository.
726 -
727 - Will merge to 'master'.
728 - source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
729 -
730 -
571 * jt/path-filter-fix (2023-06-13) 4 commits
572 - commit-graph: new filter ver. that fixes murmur3
573 - repo-settings: introduce commitgraph.changedPathsVersion
@@ -766,26 +606,6 @@ Release tarballs are available at:
606 source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
607
608
769 -* ja/worktree-orphan (2023-05-17) 8 commits
770 - (merged to 'next' on 2023-06-15 at 16bb552b79)
771 - + worktree add: emit warn when there is a bad HEAD
772 - + worktree add: extend DWIM to infer --orphan
773 - + worktree add: introduce "try --orphan" hint
774 - + worktree add: add --orphan flag
775 - + t2400: add tests to verify --quiet
776 - + t2400: refactor "worktree add" opt exclusion tests
777 - + t2400: cleanup created worktree in test
778 - + worktree add: include -B in usage docs
779 -
780 - Originally merged to 'next' on 2023-06-14
781 -
782 - 'git worktree add' learned how to create a worktree based on an
783 - orphaned branch with `--orphan`.
784 -
785 - Will merge to 'master'.
786 - source: <20230517214711.12467-1-jacobabel@nullpo.dev>
787 -
788 -
609 * tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits
610 - ls-refs.c: avoid enumerating hidden refs where possible
611 - upload-pack.c: avoid enumerating hidden refs where possible
@@ -806,12 +626,11 @@ Release tarballs are available at:
626
627 Enumerating refs in the packed-refs file, while excluding refs that
628 match certain patterns, has been optimized.
809 -
629 source: <cover.1687270849.git.me@ttaylorr.com>
630
631
813 -* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
814 - (merged to 'next' on 2023-06-15 at 76ebce0b7a)
632 +* en/header-split-cache-h-part-3 (2023-06-21) 28 commits
633 + (merged to 'next' on 2023-06-23 at 84ad22bf36)
634 + fsmonitor-ll.h: split this header out of fsmonitor.h
635 + hash-ll, hashmap: move oidhash() to hash-ll
636 + object-store-ll.h: split this header out of object-store.h
@@ -840,14 +659,10 @@ Release tarballs are available at:
659 + init-db, clone: change unnecessary global into passed parameter
660 + init-db: remove unnecessary global variable
661 + init-db: document existing bug with core.bare in template config
843 - + Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
844 - (this branch is used by js/cmake-wo-cache-h.)
845 -
846 - Originally merged to 'next' on 2023-06-13
662
663 Header files cleanup.
664
850 - Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h
665 + Will merge to 'master'.
666 source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
667
668
@@ -871,19 +686,6 @@ Release tarballs are available at:
686 source: <20230602102533.876905-1-christian.couder@gmail.com>
687
688
874 -* tb/gc-recent-object-hook (2023-06-12) 2 commits
875 - (merged to 'next' on 2023-06-16 at 2d8d8ea2ef)
876 - + gc: introduce `gc.recentObjectsHook`
877 - + reachable.c: extract `obj_is_recent()`
878 -
879 - "git pack-objects" learned to invoke a new hook program that
880 - enumerates extra objects to be used as anchoring points to keep
881 - otherwise unreachable objects in cruft packs.
882 -
883 - Will merge to 'master'.
884 - source: <cover.1686178684.git.me@ttaylorr.com>
885 -
886 -
689 * ob/revert-of-revert (2023-05-05) 1 commit
690 - sequencer: beautify subject of reverts of reverts
691
@@ -909,31 +711,18 @@ Release tarballs are available at:
711 source: <20230606194720.2053551-1-calvinwan@google.com>
712
713
912 -* tl/notes-separator (2023-04-28) 6 commits
714 +* tl/notes-separator (2023-06-21) 7 commits
715 + - notes: introduce "--no-separator" option
716 - notes.c: introduce "--[no-]stripspace" option
717 - notes.c: append separator instead of insert by pos
718 - notes.c: introduce '--separator=<paragraph-break>' option
719 - t3321: add test cases about the notes stripspace behavior
720 - notes.c: use designated initializers for clarity
721 - notes.c: cleanup 'strbuf_grow' call in 'append_edit'
919 - (this branch is used by jc/notes-separator-fix.)
722
723 'git notes append' was taught '--separator' to specify string to insert
724 between paragraphs.
923 -
924 - Expecting a reroll.
925 - cf. <20230615071314.GC1460739@coredump.intra.peff.net>
926 - source: <cover.1682671758.git.dyroneteng@gmail.com>
927 -
928 -
929 -* jc/notes-separator-fix (2023-06-13) 1 commit
930 - - notes: do not access before the beginning of an array
931 - (this branch uses tl/notes-separator.)
932 -
933 - Fix to tl/notes-separator topic.
934 -
935 - Will drop once tl/notes-separator gets updated.
936 - source: <cover.1682671758.git.dyroneteng@gmail.com>
725 + source: <cover.1685174011.git.dyroneteng@gmail.com>
726
727
728 * pw/rebase-i-after-failure (2023-04-21) 6 commits
@@ -952,23 +741,6 @@ Release tarballs are available at:
741 cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
742 source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
743
955 -
956 -* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
957 - + pack-bitmap.c: use commit boundary during bitmap traversal
958 - + pack-bitmap.c: extract `fill_in_bitmap()`
959 - + object: add object_array initializer helper function
960 - (this branch is used by ds/disable-replace-refs.)
961 -
962 - Originally merged to 'next' on 2023-06-15
963 -
964 - The object traversal using reachability bitmap done by
965 - "pack-object" has been tweaked to take advantage of the fact that
966 - using "boundary" commits as representative of all the uninteresting
967 - ones can save quite a lot of object enumeration.
968 -
969 - Will merge to 'master'.
970 - source: <cover.1683567065.git.me@ttaylorr.com>
971 -
744 --------------------------------------------------
745 [Discarded]
746
@@ -998,3 +770,21 @@ Release tarballs are available at:
770 Retracted for now.
771 cf. <ZJCI6FHtbuOKPlV1@nand.local>
772 source: <cover.1679342296.git.me@ttaylorr.com>
773 +
774 +
775 +* js/cmake-wo-cache-h (2023-06-15) 1 commit
776 + . cmake: adapt to `cache.h` being no more
777 +
778 + Build fix in en/header-split-cache-h-part-3 topic.
779 +
780 + Ejected out of 'next' and made into a part of en/header-split-cache-h-part-3
781 + source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
782 +
783 +
784 +* jc/notes-separator-fix (2023-06-13) 7 commits
785 + . notes: do not access before the beginning of an array
786 +
787 + Fix to tl/notes-separator topic.
788 +
789 + Discarded as the updated base topic should not require it anymore.
790 + source: <cover.1682671758.git.dyroneteng@gmail.com>