@matheusbsbs / matheus-bagliano / commits / dc6f74fae2

What's cooking (2021/10 #01)

Junio C Hamano committed Oct 4, 2021 at 14:38 UTC dc6f74fae2ea843b180ac7e0ec90a9d08abf12d0
1 file changed +393 -307
whats-cooking.txt
+393 -307
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Sep 2021, #09; Thu, 30)
4 -X-master-at: cefe983a320c03d7843ac78e73bd513a27806845
5 -X-next-at: 93a45727a2bf02ed8222a19bc9fdad4616d68eed
3 +Subject: What's cooking in git.git (Oct 2021, #01; Mon, 4)
4 +X-master-at: 0785eb769886ae81e346df10e88bc49ffc0ac64e
5 +X-next-at: a309979bdfa2728e6961a1392c14b7ffd5cb9fa6
6
7 -What's cooking in git.git (Sep 2021, #09; Thu, 30)
7 +What's cooking in git.git (Oct 2021, #01; Mon, 4)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -18,6 +18,9 @@ useful"). Do not read too much into a topic being in (or not in)
18 'seen'. The ones marked with '.' do not appear in any of the
19 integration branches, but I am still holding onto them.
20
21 +Quite a few topics have graduated to 'master' and a handful of
22 +topics are getting readied for 'next'.
23 +
24 Copies of the source code to Git live in many repositories, and the
25 following is a list of the ones I push into or their mirrors. Some
26 repositories have only a subset of branches.
@@ -49,57 +52,305 @@ Release tarballs are available at:
52 --------------------------------------------------
53 [Graduated to 'master']
54
52 -* cb/unicode-14 (2021-09-17) 1 commit
53 - (merged to 'next' on 2021-09-20 at 7873b310ad)
54 - + unicode: update the width tables to Unicode 14
55 +* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
56 + (merged to 'next' on 2021-09-28 at 532f2aa26e)
57 + + Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
58 +
59 + Improve build procedure for developers.
60 +
61 +
62 +* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
63 + (merged to 'next' on 2021-09-28 at 8251d269a2)
64 + + bundle: remove ignored & undocumented "--verbose" flag
65 +
66 + Doc update.
67 +
68 +
69 +* ab/make-clean-depend-dirs (2021-09-22) 1 commit
70 + (merged to 'next' on 2021-09-28 at 20483ade7d)
71 + + Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
72 +
73 + "make clean" has been updated to remove leftover .depend/
74 + directories, even when it is not told to use them to compute header
75 + dependencies.
76 +
77 +
78 +* ab/make-compdb-fix (2021-09-27) 1 commit
79 + (merged to 'next' on 2021-09-29 at b3439753df)
80 + + Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
81 +
82 + Build update.
83 +
84 +
85 +* ab/refs-files-cleanup (2021-08-25) 13 commits
86 + (merged to 'next' on 2021-09-23 at eb5668523f)
87 + + refs/files: remove unused "errno != ENOTDIR" condition
88 + + refs/files: remove unused "errno == EISDIR" code
89 + + refs/files: remove unused "oid" in lock_ref_oid_basic()
90 + + refs API: remove OID argument to reflog_expire()
91 + + reflog expire: don't lock reflogs using previously seen OID
92 + + refs/files: add a comment about refs_reflog_exists() call
93 + + refs: make repo_dwim_log() accept a NULL oid
94 + + refs/debug: re-indent argument list for "prepare"
95 + + refs/files: remove unused "skip" in lock_raw_ref() too
96 + + refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
97 + + refs: drop unused "flags" parameter to lock_ref_oid_basic()
98 + + refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
99 + + refs/packet: add missing BUG() invocations to reflog callbacks
100 + (this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.)
101 +
102 + Continued work on top of the hn/refs-errno-cleanup topic.
103 +
104 +
105 +* ah/connect-parse-feature-v0-fix (2021-09-27) 1 commit
106 + (merged to 'next' on 2021-09-29 at 93a45727a2)
107 + + connect: also update offset for features without values
108 +
109 + Protocol v0 clients can get stuck parsing a malformed feature line.
110 +
111 +
112 +* bs/difftool-msg-tweak (2021-09-22) 1 commit
113 + (merged to 'next' on 2021-09-29 at 22d485e560)
114 + + difftool: fix word spacing in the usage strings
115 +
116 + Message tweak.
117 +
118 +
119 +* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
120 + (merged to 'next' on 2021-09-28 at d27c228644)
121 + + ls-files: use imperative mood for -X and -z option description
122 +
123 + Help text for "ls-files" options have been updated.
124 +
125 +
126 +* cb/cvsserver (2021-09-16) 3 commits
127 + (merged to 'next' on 2021-09-23 at 98f5f3f9cf)
128 + + Documentation: cleanup git-cvsserver
129 + + git-cvsserver: protect against NULL in crypt(3)
130 + + git-cvsserver: use crypt correctly to compare password hashes
131 +
132 + "git cvsserver" had a long-standing bug in its authentication code,
133 + which has finally been corrected (it is unclear and is a separate
134 + question if anybody is seriously using it, though).
135 +
136 +
137 +* da/difftool-dir-diff-symlink-fix (2021-09-23) 1 commit
138 + (merged to 'next' on 2021-09-28 at e2170ed0d7)
139 + + difftool: fix symlink-file writing in dir-diff mode
140 + (this branch is used by da/difftool.)
141 +
142 + "git difftool --dir-diff" mishandled symbolic links.
143 +
144 +
145 +* ds/perf-test-built-path-fix (2021-09-22) 1 commit
146 + (merged to 'next' on 2021-09-28 at 18a21483d9)
147 + + t/perf/run: fix bin-wrappers computation
148 +
149 + Perf test fix.
150 +
151 +
152 +* en/stash-df-fix (2021-09-10) 3 commits
153 + (merged to 'next' on 2021-09-20 at 513c11fb11)
154 + + stash: restore untracked files AFTER restoring tracked files
155 + + stash: avoid feeding directories to update-index
156 + + t3903: document a pair of directory/file bugs
157 +
158 + "git stash", where the tentative change involves changing a
159 + directory to a file (or vice versa), was confused, which has been
160 + corrected.
161 +
162 +
163 +* hn/refs-errno-cleanup (2021-08-25) 4 commits
164 + (merged to 'next' on 2021-09-23 at 502e6b6b08)
165 + + refs: make errno output explicit for read_raw_ref_fn
166 + + refs/files-backend: stop setting errno from lock_ref_oid_basic
167 + + refs: remove EINVAL errno output from specification of read_raw_ref_fn
168 + + refs file backend: move raceproof_create_file() here
169 + (this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.)
170 +
171 + Futz with the way 'errno' is relied on in the refs API to carry the
172 + failure modes up the call chain.
173 +
174 +
175 +* jk/clone-unborn-head-in-bare (2021-09-20) 1 commit
176 + (merged to 'next' on 2021-09-20 at 93c93b8d51)
177 + + clone: handle unborn branch in bare repos
178 +
179 + "git clone" from a repository whose HEAD is unborn into a bare
180 + repository didn't follow the branch name the other side used, which
181 + is corrected.
182 +
183
56 - The unicode character width table (used for output alignment) has
57 - been updated.
184 +* jk/http-redact-fix (2021-09-22) 1 commit
185 + (merged to 'next' on 2021-09-28 at ef4570a5d1)
186 + + http: match headers case-insensitively when redacting
187 +
188 + Sensitive data in the HTTP trace were supposed to be redacted, but
189 + we failed to do so in HTTP/2 requests.
190
191
60 -* en/typofixes (2021-09-20) 2 commits
61 - (merged to 'next' on 2021-09-20 at 48648dafa3)
62 - + merge-ort: fix completely wrong comment
63 - + trace2.h: fix trivial comment typo
192 +* jx/ci-l10n (2021-09-09) 1 commit
193 + (merged to 'next' on 2021-09-23 at b2d7f5eecb)
194 + + ci: new github-action for git-l10n code review
195
65 - Typofixes.
196 + CI help for l10n.
197
198
68 -* jk/reduce-malloc-in-v2-servers (2021-09-15) 12 commits
69 - (merged to 'next' on 2021-09-16 at 40cfe41efc)
70 - + ls-refs: reject unknown arguments
71 - + serve: reject commands used as capabilities
72 - + serve: reject bogus v2 "command=ls-refs=foo"
73 - + docs/protocol-v2: clarify some ls-refs ref-prefix details
74 - + ls-refs: ignore very long ref-prefix counts
75 - + serve: drop "keys" strvec
76 - + serve: provide "receive" function for session-id capability
77 - + serve: provide "receive" function for object-format capability
78 - + serve: add "receive" method for v2 capabilities table
79 - + serve: return capability "value" from get_capability()
80 - + serve: rename is_command() to parse_command()
81 - + Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers
199 +* rs/close-pack-leakfix (2021-09-24) 1 commit
200 + (merged to 'next' on 2021-09-28 at b14502faa0)
201 + + packfile: release bad_objects in close_pack()
202
83 - Code cleanup to limit memory consumption and tighten protocol
84 - message parsing.
203 + Leakfix.
204
205 --------------------------------------------------
206 [New Topics]
207
208 +* ab/retire-decl-of-missing-unused-funcs (2021-10-01) 4 commits
209 + (merged to 'next' on 2021-10-03 at a49287eaa9)
210 + + config.h: remove unused git_config_get_untracked_cache() declaration
211 + + log-tree.h: remove unused function declarations
212 + + grep.h: remove unused grep_threads_ok() declaration
213 + + builtin.h: remove cmd_tar_tree() declaration
214 +
215 + Remove external declaration of functions that no longer exist.
216 +
217 + Will merge to 'master'.
218 +
219 +
220 +* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
221 + - rebase -m: don't fork git checkout
222 + - rebase --apply: set ORIG_HEAD correctly
223 + - rebase --apply: fix reflog
224 + - reset_head(): take struct rebase_head_opts
225 + - rebase: cleanup reset_head() calls
226 + - reset_head(): make default_reflog_action optional
227 + - reset_head(): factor out ref updates
228 + - reset_head(): remove action parameter
229 + - reset_head(): don't run checkout hook if there is an error
230 + - reset_head(): fix checkout
231 + - rebase: factor out checkout for up to date branch
232 + - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head
233 + (this branch uses pw/rebase-of-a-tag-fix.)
234 +
235 + Fix "some issues" in a helper function reset_head().
236 +
237 + Expecting a reroll.
238 + Needs a lot better explanation, including what the issues are,
239 + which codepaths the helper is used and to do what, and tests to
240 + protect the fixes.
241 +
242 +
243 +* rs/mergesort (2021-10-01) 9 commits
244 + (merged to 'next' on 2021-10-03 at 29a672574f)
245 + + mergesort: use ranks stack
246 + + p0071: test performance of llist_mergesort()
247 + + p0071: measure sorting of already sorted and reversed files
248 + + test-mergesort: add unriffle_skewed mode
249 + + test-mergesort: add unriffle mode
250 + + test-mergesort: add generate subcommand
251 + + test-mergesort: add test subcommand
252 + + test-mergesort: add sort subcommand
253 + + test-mergesort: use strbuf_getline()
254 +
255 + The mergesort implementation used to sort linked list has been
256 + optimized.
257 +
258 + Will merge to 'master'.
259 +
260 +
261 +* bs/doc-blame-color-lines (2021-10-01) 2 commits
262 + - blame: document --color-* options
263 + - blame: describe default output format
264 +
265 + The "--color-lines" and "--color-by-age" options of "git blame"
266 + have been missing, which are now documented.
267 +
268 + Expecting a reroll.
269 + cf. <CAPig+cSWutBRQK+Qy=nkaDZRvy4trVNPuo+cF-quC2rBwNe2fw@mail.gmail.com>
270 +
271 +
272 +* mr/bisect-in-c-4 (2021-10-01) 1 commit
273 + - bisect--helper: add space between colon and following sentence
274 +
275 + Message fix.
276 +
277 + Will merge to 'next'.
278 +
279 +
280 +* cm/save-restore-terminal (2021-10-04) 2 commits
281 + - editor: save and reset terminal after calling EDITOR
282 + - terminal: teach git how to save/restore its terminal settings
283 +
284 + An editor session launched during a Git operation (e.g. during 'git
285 + commit') can leave the terminal in a funny state. The code path
286 + has updated to save the terminal state before, and restore it
287 + after, it spawns an editor.
288 +
289 + Will merge to 'next'.
290 +
291 +
292 +* rs/p3400-lose-tac (2021-10-03) 1 commit
293 + - p3400: stop using tac(1)
294 +
295 + Test portability update.
296 +
297 + Will merge to 'next'.
298 +
299 +
300 +* ja/doc-status-types-and-copies (2021-10-04) 4 commits
301 + - Documentation/git-status: mention how to detect copies
302 + - Documentation/git-status: document porcelain status T (typechange)
303 + - Documentation/diff-format: state in which cases porcelain status is T
304 + - Documentation/git-status: remove impossible porcelain status DR and DC
305 +
306 + A few kinds of changes "git status" can show were not described.
307 +
308 + Will merge to 'next'.
309 +
310 +
311 +* tb/aggregate-ignore-leading-whitespaces (2021-10-04) 1 commit
312 + - t/perf/aggregate.perl: tolerate leading spaces
313 +
314 + Test portability update.
315 +
316 + Will merge to 'next'.
317 +
318 +--------------------------------------------------
319 +[Stalled]
320 +
321 +* ar/submodule-update (2021-09-20) 8 commits
322 + . submodule--helper: rename helper functions
323 + . submodule--helper: remove unused helpers
324 + . submodule--helper: remove update-clone subcommand
325 + . submodule: move core cmd_update() logic to C
326 + . submodule--helper: refactor get_submodule_displaypath()
327 + . submodule--helper: rename helpers for update-clone
328 + . submodule--helper: get remote names from any repository
329 + . submodule--helper: split up ensure_core_worktree()
330 +
331 + Rewrite of "git submodule update" in C.
332 +
333 + Kicked out of 'seen' to make room for es/superproject-aware-submodules
334 + which is among the topics this topic stomps on.
335 +
336 +--------------------------------------------------
337 +[Cooking]
338 +
339 * ab/designated-initializers (2021-09-27) 5 commits
90 - - cbtree.h: define cb_init() in terms of CBTREE_INIT
91 - - *.h: move some *_INIT to designated initializers
92 - - *.h _INIT macros: don't specify fields equal to 0
93 - - *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom
94 - - submodule-config.h: remove unused SUBMODULE_INIT macro
340 + (merged to 'next' on 2021-10-03 at 179f652de6)
341 + + cbtree.h: define cb_init() in terms of CBTREE_INIT
342 + + *.h: move some *_INIT to designated initializers
343 + + *.h _INIT macros: don't specify fields equal to 0
344 + + *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom
345 + + submodule-config.h: remove unused SUBMODULE_INIT macro
346 (this branch is used by ab/designated-initializers-more.)
347
348 Code clean-up.
349
99 - Will merge to 'next'.
350 + Will merge to 'master'.
351
352
102 -* ab/designated-initializers-more (2021-09-27) 6 commits
353 +* ab/designated-initializers-more (2021-10-01) 6 commits
354 - builtin/remote.c: add and use SHOW_INFO_INIT
355 - builtin/remote.c: add and use a REF_STATES_INIT
356 - urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT
@@ -110,26 +361,28 @@ Release tarballs are available at:
361
362 Code clean-up.
363
113 - What's the status of this one? Meh?
364 + Will merge to 'next'?
365
366
367 * lh/systemd-timers (2021-09-27) 1 commit
117 - - maintenance: fix test t7900-maintenance.sh
368 + (merged to 'next' on 2021-10-03 at 81834609ea)
369 + + maintenance: fix test t7900-maintenance.sh
370
371 Testfix.
372
121 - Will merge to 'next'.
373 + Will merge to 'master'.
374
375
376 * os/status-docfix (2021-09-28) 1 commit
125 - - doc: fix capitalization in "git status --porcelain=v2" description
377 + (merged to 'next' on 2021-10-03 at a13019916a)
378 + + doc: fix capitalization in "git status --porcelain=v2" description
379
380 Docfix.
381
129 - Will merge to 'next'.
382 + Will merge to 'master'.
383
384
132 -* ab/parse-options-cleanup (2021-09-28) 10 commits
385 +* ab/parse-options-cleanup (2021-10-01) 11 commits
386 - parse-options: change OPT_{SHORT,UNSET} to an enum
387 - parse-options tests: test optname() output
388 - parse-options.[ch]: make opt{bug,name}() "static"
@@ -137,41 +390,45 @@ Release tarballs are available at:
390 - parse-options.c: move optname() earlier in the file
391 - parse-options.h: make the "flags" in "struct option" an enum
392 - parse-options.c: use exhaustive "case" arms for "enum parse_opt_type"
393 + - parse-options.c: use exhaustive "case" arms for "enum parse_opt_result"
394 - parse-options.[ch]: consistently use "enum parse_opt_result"
395 - parse-options.[ch]: consistently use "enum parse_opt_flags"
396 - parse-options.h: move PARSE_OPT_SHELL_EVAL between enums
397
398 Random changes to parse-options implementation.
399
146 - What's the status of this one? Meh?
400 + Will merge to 'next'?
401
402
403 * ab/retire-git-config-key-is-valid (2021-09-28) 1 commit
150 - - config.c: remove unused git_config_key_is_valid()
404 + (merged to 'next' on 2021-10-03 at fc7a0a55d1)
405 + + config.c: remove unused git_config_key_is_valid()
406
407 Code cleanup.
408
154 - Will merge to 'next'.
409 + Will merge to 'master'.
410
411
412 * ab/retire-refs-unused-funcs (2021-09-28) 5 commits
158 - - refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
159 - - refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
160 - - refs/ref-cache.[ch]: remove unused add_ref_entry()
161 - - refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
162 - - refs.[ch]: remove unused ref_storage_backend_exists()
413 + (merged to 'next' on 2021-10-03 at f91e74fa7d)
414 + + refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
415 + + refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
416 + + refs/ref-cache.[ch]: remove unused add_ref_entry()
417 + + refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
418 + + refs.[ch]: remove unused ref_storage_backend_exists()
419
420 Code cleanup.
421
166 - Will merge to 'next'.
422 + Will merge to 'master'.
423
424
425 * ab/retire-string-list-init (2021-09-28) 1 commit
170 - - string-list.[ch]: remove string_list_init() compatibility function
426 + (merged to 'next' on 2021-10-03 at 4834949cc3)
427 + + string-list.[ch]: remove string_list_init() compatibility function
428
429 Code cleanup.
430
174 - Will merge to 'next'.
431 + Will merge to 'master'.
432
433
434 * mt/grep-submodule-textconv (2021-09-29) 1 commit
@@ -185,26 +442,6 @@ Release tarballs are available at:
442
443 Will merge to 'next'.
444
188 ---------------------------------------------------
189 -[Stalled]
190 -
191 -* ar/submodule-update (2021-09-20) 8 commits
192 - . submodule--helper: rename helper functions
193 - . submodule--helper: remove unused helpers
194 - . submodule--helper: remove update-clone subcommand
195 - . submodule: move core cmd_update() logic to C
196 - . submodule--helper: refactor get_submodule_displaypath()
197 - . submodule--helper: rename helpers for update-clone
198 - . submodule--helper: get remote names from any repository
199 - . submodule--helper: split up ensure_core_worktree()
200 -
201 - Rewrite of "git submodule update" in C.
202 -
203 - Kicked out of 'seen' to make room for es/superproject-aware-submodules
204 - which is among the topics this topic stomps on.
205 -
206 ---------------------------------------------------
207 -[Cooking]
445
446 * es/superproject-aware-submodules (2021-08-19) 5 commits
447 - fixup! introduce submodule.superprojectGitDir record
@@ -220,7 +457,7 @@ Release tarballs are available at:
457 of 'seen', without the conflicting ar/submodule-update topic.
458
459
223 -* ab/fsck-unexpected-type (2021-09-30) 17 commits
460 +* ab/fsck-unexpected-type (2021-10-01) 17 commits
461 - fsck: report invalid object type-path combinations
462 - fsck: don't hard die on invalid object types
463 - object-file.c: stop dying in parse_loose_header()
@@ -245,15 +482,6 @@ Release tarballs are available at:
482 Will merge to 'next'?
483
484
248 -* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
249 - (merged to 'next' on 2021-09-28 at 8251d269a2)
250 - + bundle: remove ignored & undocumented "--verbose" flag
251 -
252 - Doc update.
253 -
254 - Will merge to 'master'.
255 -
256 -
485 * ab/config-based-hooks-1 (2021-09-27) 8 commits
486 - hook-list.h: add a generated list of hooks, like config-list.h
487 - hook.c users: use "hook_exists()" instead of "find_hook()"
@@ -266,47 +494,42 @@ Release tarballs are available at:
494
495 Mostly preliminary clean-up in the hook API.
496
269 -
270 -* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
271 - - http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
272 -
273 - HTTPS error handling updates.
274 -
497 Will merge to 'next'.
498
499
278 -* ab/make-compdb-fix (2021-09-27) 1 commit
279 - (merged to 'next' on 2021-09-29 at b3439753df)
280 - + Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
500 +* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
501 + (merged to 'next' on 2021-10-03 at cd67328eed)
502 + + http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
503
282 - Build update.
504 + HTTPS error handling updates.
505
506 Will merge to 'master'.
507
508
509 * jk/ref-paranoia (2021-09-27) 16 commits
288 - - refs: drop "broken" flag from for_each_fullref_in()
289 - - ref-filter: drop broken-ref code entirely
290 - - ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
291 - - repack, prune: drop GIT_REF_PARANOIA settings
292 - - refs: turn on GIT_REF_PARANOIA by default
293 - - refs: omit dangling symrefs when using GIT_REF_PARANOIA
294 - - refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
295 - - refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
296 - - refs-internal.h: move DO_FOR_EACH_* flags next to each other
297 - - t5312: be more assertive about command failure
298 - - t5312: test non-destructive repack
299 - - t5312: create bogus ref as necessary
300 - - t5312: drop "verbose" helper
301 - - t5600: provide detached HEAD for corruption failures
302 - - t5516: don't use HEAD ref for invalid ref-deletion tests
303 - - t7900: clean up some more broken refs
510 + (merged to 'next' on 2021-10-03 at 8c2cb6a3a6)
511 + + refs: drop "broken" flag from for_each_fullref_in()
512 + + ref-filter: drop broken-ref code entirely
513 + + ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
514 + + repack, prune: drop GIT_REF_PARANOIA settings
515 + + refs: turn on GIT_REF_PARANOIA by default
516 + + refs: omit dangling symrefs when using GIT_REF_PARANOIA
517 + + refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
518 + + refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
519 + + refs-internal.h: move DO_FOR_EACH_* flags next to each other
520 + + t5312: be more assertive about command failure
521 + + t5312: test non-destructive repack
522 + + t5312: create bogus ref as necessary
523 + + t5312: drop "verbose" helper
524 + + t5600: provide detached HEAD for corruption failures
525 + + t5516: don't use HEAD ref for invalid ref-deletion tests
526 + + t7900: clean up some more broken refs
527 (this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
528
529 The ref iteration code used to optionally allow dangling refs to be
530 shown, which has been tightened up.
531
309 - Will merge to 'next'.
532 + Will merge to 'master'.
533
534
535 * pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
@@ -320,44 +543,6 @@ Release tarballs are available at:
543 Will merge to 'master'.
544
545
323 -* rs/close-pack-leakfix (2021-09-24) 1 commit
324 - (merged to 'next' on 2021-09-28 at b14502faa0)
325 - + packfile: release bad_objects in close_pack()
326 -
327 - Leakfix.
328 -
329 - Will merge to 'master'.
330 -
331 -
332 -* ab/make-clean-depend-dirs (2021-09-22) 1 commit
333 - (merged to 'next' on 2021-09-28 at 20483ade7d)
334 - + Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
335 -
336 - "make clean" has been updated to remove leftover .depend/
337 - directories, even when it is not told to use them to compute header
338 - dependencies.
339 -
340 - Will merge to 'master'.
341 -
342 -
343 -* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
344 - (merged to 'next' on 2021-09-28 at d27c228644)
345 - + ls-files: use imperative mood for -X and -z option description
346 -
347 - Help text for "ls-files" options have been updated.
348 -
349 - Will merge to 'master'.
350 -
351 -
352 -* ds/perf-test-built-path-fix (2021-09-22) 1 commit
353 - (merged to 'next' on 2021-09-28 at 18a21483d9)
354 - + t/perf/run: fix bin-wrappers computation
355 -
356 - Perf test fix.
357 -
358 - Will merge to 'master'.
359 -
360 -
546 * gc/doc-first-contribution-reroll (2021-09-22) 1 commit
547 (merged to 'next' on 2021-09-29 at b7dea55eae)
548 + MyFirstContribution: Document --range-diff option when writing v2
@@ -381,32 +566,14 @@ Release tarballs are available at:
566 Will merge to 'master'.
567
568
384 -* jk/http-redact-fix (2021-09-22) 1 commit
385 - (merged to 'next' on 2021-09-28 at ef4570a5d1)
386 - + http: match headers case-insensitively when redacting
387 -
388 - Sensitive data in the HTTP trace were supposed to be redacted, but
389 - we failed to do so in HTTP/2 requests.
390 -
391 - Will merge to 'master'.
392 -
393 -
569 * js/win-lazyload-buildfix (2021-09-28) 3 commits
395 - - Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
396 - - lazyload.h: use an even more generic function pointer than FARPROC
397 - - lazyload.h: fix warnings about mismatching function pointer types
570 + (merged to 'next' on 2021-10-03 at 26802e5d73)
571 + + Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
572 + + lazyload.h: use an even more generic function pointer than FARPROC
573 + + lazyload.h: fix warnings about mismatching function pointer types
574
575 Compilation fix.
576
401 - Will merge to 'next'.
402 -
403 -
404 -* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
405 - (merged to 'next' on 2021-09-28 at 532f2aa26e)
406 - + Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
407 -
408 - Improve build procedure for developers.
409 -
577 Will merge to 'master'.
578
579
@@ -419,15 +586,6 @@ Release tarballs are available at:
586 Will merge to 'next'?
587
588
422 -* bs/difftool-msg-tweak (2021-09-22) 1 commit
423 - (merged to 'next' on 2021-09-29 at 22d485e560)
424 - + difftool: fix word spacing in the usage strings
425 -
426 - Message tweak.
427 -
428 - Will merge to 'master'.
429 -
430 -
589 * ew/midx-doc-update (2021-09-24) 1 commit
590 (merged to 'next' on 2021-09-28 at f2cbe598eb)
591 + doc/technical: update note about core.multiPackIndex
@@ -437,7 +595,8 @@ Release tarballs are available at:
595 Will merge to 'master'.
596
597
440 -* jt/no-abuse-alternate-odb-for-submodules (2021-09-29) 9 commits
598 +* jt/no-abuse-alternate-odb-for-submodules (2021-10-01) 10 commits
599 + - fixup! refs: plumb repo into ref stores
600 - submodule: trace adding submodule ODB as alternate
601 - submodule: pass repo to check_has_commit()
602 - object-file: only register submodule ODB if needed
@@ -491,35 +650,17 @@ Release tarballs are available at:
650 Will merge to 'master'.
651
652
494 -* ah/connect-parse-feature-v0-fix (2021-09-27) 1 commit
495 - (merged to 'next' on 2021-09-29 at 93a45727a2)
496 - + connect: also update offset for features without values
497 -
498 - Protocol v0 clients can get stuck parsing a malformed feature line.
499 -
500 - Will merge to 'master'.
501 -
502 -
503 -* da/difftool (2021-09-30) 7 commits
504 - - difftool: remove an unnecessary call to strbuf_release()
505 - - difftool: refactor dir-diff to write files using a helper function
506 - - difftool: avoid returning -1 to cmd_main() from run_dir_diff()
507 - - difftool: add a missing space to the run_dir_diff() comments
508 - - difftool: create a tmpdir path without repeated slashes
509 - - Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
510 - - Merge branch 'ab/retire-option-argument' into da/difftool
511 - (this branch uses da/difftool-dir-diff-symlink-fix.)
653 +* da/difftool (2021-09-30) 6 commits
654 + (merged to 'next' on 2021-10-03 at 3ba0335e4e)
655 + + difftool: add a missing space to the run_dir_diff() comments
656 + + difftool: remove an unnecessary call to strbuf_release()
657 + + difftool: refactor dir-diff to write files using helper functions
658 + + difftool: create a tmpdir path without repeated slashes
659 + + Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
660 + + Merge branch 'ab/retire-option-argument' into da/difftool
661
662 Code clean-up in "git difftool".
663
515 -
516 -* da/difftool-dir-diff-symlink-fix (2021-09-23) 1 commit
517 - (merged to 'next' on 2021-09-28 at e2170ed0d7)
518 - + difftool: fix symlink-file writing in dir-diff mode
519 - (this branch is used by da/difftool.)
520 -
521 - "git difftool --dir-diff" mishandled symbolic links.
522 -
664 Will merge to 'master'.
665
666
@@ -539,7 +680,7 @@ Release tarballs are available at:
680
681 Various fixes in code paths that move untracked files away to make room.
682
542 - Will merge to 'next'?
683 + Will merge to 'next'.
684
685
686 * ks/submodule-add-message-fix (2021-09-20) 1 commit
@@ -571,32 +712,24 @@ Release tarballs are available at:
712 Will merge to 'master'.
713
714
574 -* jk/clone-unborn-head-in-bare (2021-09-20) 1 commit
575 - (merged to 'next' on 2021-09-20 at 93c93b8d51)
576 - + clone: handle unborn branch in bare repos
577 -
578 - "git clone" from a repository whose HEAD is unborn into a bare
579 - repository didn't follow the branch name the other side used, which
580 - is corrected.
581 -
582 - Will merge to 'master'.
583 -
584 -
585 -* ns/batched-fsync (2021-09-27) 8 commits
586 - - core.fsyncobjectfiles: performance tests for add and stash
587 - - core.fsyncobjectfiles: tests for batch mode
588 - - unpack-objects: use the bulk-checkin infrastructure
589 - - update-index: use the bulk-checkin infrastructure
590 - - core.fsyncobjectfiles: add windows support for batch mode
591 - - core.fsyncobjectfiles: batched disk flushes
592 - - bulk-checkin: rename 'state' variable and separate 'plugged' boolean
593 - - object-file.c: do not rename in a temp odb
715 +* ns/batched-fsync (2021-10-04) 9 commits
716 + . core.fsyncobjectfiles: performance tests for add and stash
717 + . core.fsyncobjectfiles: tests for batch mode
718 + . unpack-objects: use the bulk-checkin infrastructure
719 + . update-index: use the bulk-checkin infrastructure
720 + . core.fsyncobjectfiles: add windows support for batch mode
721 + . core.fsyncobjectfiles: batched disk flushes
722 + . bulk-checkin: rename 'state' variable and separate 'plugged' boolean
723 + . tmp-objdir: disable ref updates when replacing the primary odb
724 + . tmp-objdir: new API for creating temporary writable databases
725
726 The "core.fsyncobjectfiles" configuration variable can now be set
727 to "batch" for improved performance.
728
729 Under discussion.
599 - Handling of temporary object directory may be iffy.
730 +
731 + Handling of temporary object directory is worked out with the
732 + en/remerge-diff topic.
733
734
735 * jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits
@@ -610,18 +743,7 @@ Release tarballs are available at:
743
744 Built-in fsmonitor (part 1).
745
613 -
614 -* cb/cvsserver (2021-09-16) 3 commits
615 - (merged to 'next' on 2021-09-23 at 98f5f3f9cf)
616 - + Documentation: cleanup git-cvsserver
617 - + git-cvsserver: protect against NULL in crypt(3)
618 - + git-cvsserver: use crypt correctly to compare password hashes
619 -
620 - "git cvsserver" had a long-standing bug in its authentication code,
621 - which has finally been corrected (it is unclear and is a separate
622 - question if anybody is seriously using it, though).
623 -
624 - Will merge to 'master'.
746 + Will merge to 'next'.
747
748
749 * ab/align-parse-options-help (2021-09-22) 4 commits
@@ -654,7 +776,7 @@ Release tarballs are available at:
776 Will merge to 'next'?
777
778
657 -* tb/repack-write-midx (2021-09-28) 9 commits
779 +* tb/repack-write-midx (2021-10-01) 9 commits
780 - builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
781 - builtin/repack.c: make largest pack preferred
782 - builtin/repack.c: support writing a MIDX while repacking
@@ -668,6 +790,8 @@ Release tarballs are available at:
790 "git repack" has been taught to generate multi-pack reachability
791 bitmaps.
792
793 + Will merge to 'next'?
794 +
795
796 * ds/add-rm-with-sparse-index (2021-09-28) 13 commits
797 - advice: update message to suggest '--sparse'
@@ -719,6 +843,7 @@ Release tarballs are available at:
843 + t3407: use test_cmp_rev
844 + t3407: use test_commit
845 + t3407: run tests in $TEST_DIRECTORY
846 + (this branch is used by pw/fix-some-issues-in-reset-head.)
847
848 "git rebase <upstream> <tag>" failed when aborted in the middle, as
849 it mistakenly tried to write the tag object instead of peeling it
@@ -734,18 +859,6 @@ Release tarballs are available at:
859 "Zealous diff3" style of merge conflict presentation has been added.
860
861
737 -* en/stash-df-fix (2021-09-10) 3 commits
738 - (merged to 'next' on 2021-09-20 at 513c11fb11)
739 - + stash: restore untracked files AFTER restoring tracked files
740 - + stash: avoid feeding directories to update-index
741 - + t3903: document a pair of directory/file bugs
742 -
743 - Fix "git stash" corner case where the tentative change involves
744 - changing a directory to a file (or vice versa).
745 -
746 - Will merge to 'master'.
747 -
748 -
862 * jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
863 (merged to 'next' on 2021-09-28 at 4d843448be)
864 + revision: remove "submodule" from opt struct
@@ -759,15 +872,6 @@ Release tarballs are available at:
872 Will merge to 'master'.
873
874
762 -* jx/ci-l10n (2021-09-09) 1 commit
763 - (merged to 'next' on 2021-09-23 at b2d7f5eecb)
764 - + ci: new github-action for git-l10n code review
765 -
766 - CI help for l10n.
767 -
768 - Will merge to 'master'.
769 -
770 -
875 * js/scalar (2021-09-14) 15 commits
876 - scalar: accept -C and -c options before the subcommand
877 - scalar: implement the `version` command
@@ -792,12 +896,13 @@ Release tarballs are available at:
896
897
898 * ab/sanitize-leak-ci (2021-09-23) 2 commits
795 - - tests: add a test mode for SANITIZE=leak, run it in CI
796 - - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS
899 + (merged to 'next' on 2021-10-03 at dcd62a3fc6)
900 + + tests: add a test mode for SANITIZE=leak, run it in CI
901 + + Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS
902
903 CI learns to run the leak sanitizer builds.
904
800 - Will merge to 'next'.
905 + Will merge to 'master'.
906
907
908 * ms/customizable-ident-expansion (2021-09-01) 1 commit
@@ -839,7 +944,10 @@ Release tarballs are available at:
944 used to show the difference between mechanical (and possibly
945 conflicted) merge results and the recorded resolution.
946
842 - Will merge to 'next'?
947 + Expecting a reroll.
948 +
949 + Handling of temporary object directory is worked out with the
950 + ns/batched-fsync topic.
951
952
953 * sg/test-split-index-fix (2021-09-07) 7 commits
@@ -862,7 +970,6 @@ Release tarballs are available at:
970 - refs: explicitly return failure_errno from parse_loose_ref_contents
971 - branch tests: test for errno propagating on failing read
972 - refs: add failure_errno to refs_read_raw_ref() signature
865 - (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)
973
974 The "remainder" of hn/refs-errno-cleanup topic.
975
@@ -882,7 +989,7 @@ Release tarballs are available at:
989
990 Updates to the tests in t0000 to test the test framework.
991
885 - Will merge to 'next'?
992 + Will merge to 'next'.
993
994
995 * ab/only-single-progress-at-once (2021-09-22) 8 commits
@@ -948,7 +1055,12 @@ Release tarballs are available at:
1055 cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
1056
1057
951 -* hn/reftable (2021-09-28) 19 commits
1058 +* hn/reftable (2021-10-01) 24 commits
1059 + - reftable: avoid non portable compile time pointer to function
1060 + - config.mak.uname: last release and snapshots of Minix still use zlib 1.2.3
1061 + - fixup! reftable: implement stack, a mutable database of reftable files.
1062 + - fixup! reftable: add a heap-based priority queue for reftable records
1063 + - squash! reftable: reading/writing blocks
1064 - Add "test-tool dump-reftable" command.
1065 - reftable: add dump utility
1066 - reftable: implement stack, a mutable database of reftable files.
@@ -972,43 +1084,7 @@ Release tarballs are available at:
1084 The "reftable" backend for the refs API, without integrating into
1085 the refs subsystem.
1086
975 - Will merge to 'next'.
976 -
977 -
978 -* ab/refs-files-cleanup (2021-08-25) 13 commits
979 - (merged to 'next' on 2021-09-23 at eb5668523f)
980 - + refs/files: remove unused "errno != ENOTDIR" condition
981 - + refs/files: remove unused "errno == EISDIR" code
982 - + refs/files: remove unused "oid" in lock_ref_oid_basic()
983 - + refs API: remove OID argument to reflog_expire()
984 - + reflog expire: don't lock reflogs using previously seen OID
985 - + refs/files: add a comment about refs_reflog_exists() call
986 - + refs: make repo_dwim_log() accept a NULL oid
987 - + refs/debug: re-indent argument list for "prepare"
988 - + refs/files: remove unused "skip" in lock_raw_ref() too
989 - + refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
990 - + refs: drop unused "flags" parameter to lock_ref_oid_basic()
991 - + refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
992 - + refs/packet: add missing BUG() invocations to reflog callbacks
993 - (this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.)
994 -
995 - Continued work on top of the hn/refs-errno-cleanup topic.
996 -
997 - Will merge to 'master'.
998 -
999 -
1000 -* hn/refs-errno-cleanup (2021-08-25) 4 commits
1001 - (merged to 'next' on 2021-09-23 at 502e6b6b08)
1002 - + refs: make errno output explicit for read_raw_ref_fn
1003 - + refs/files-backend: stop setting errno from lock_ref_oid_basic
1004 - + refs: remove EINVAL errno output from specification of read_raw_ref_fn
1005 - + refs file backend: move raceproof_create_file() here
1006 - (this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.)
1007 -
1008 - Futz with the way 'errno' is relied on in the refs API to carry the
1009 - failure modes up the call chain.
1010 -
1011 - Will merge to 'master'.
1087 + Expecting a reroll.
1088
1089 --------------------------------------------------
1090 [Discarded]
@@ -1169,3 +1245,13 @@ Release tarballs are available at:
1245
1246 Retracted.
1247 cf. <05754f9c-cd58-30f5-e2d3-58b9221d2770@ahunt.org>
1248 +
1249 +
1250 +* rs/p5311-use-test-file-size (2021-10-03) 1 commit
1251 + . p5311: handle spaces in wc(1) output
1252 +
1253 + Test portability update.
1254 +
1255 + The tb/aggregate-ignore-leading-whitespaces supersedes this topic.
1256 +
1257 +