@matheusbsbs / matheus-bagliano / commits / 91bb2276b9

What's cooking (2021/10 #02)

Junio C Hamano committed Oct 6, 2021 at 14:15 UTC 91bb2276b9f52f3f18d458bc900921a1c6db9227
1 file changed +245 -390
whats-cooking.txt
+245 -390
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Oct 2021, #01; Mon, 4)
4 -X-master-at: 0785eb769886ae81e346df10e88bc49ffc0ac64e
5 -X-next-at: a309979bdfa2728e6961a1392c14b7ffd5cb9fa6
3 +Subject: What's cooking in git.git (Oct 2021, #02; Wed, 6)
4 +X-master-at: 106298f7f9cca4158a980de149ef217751e1f943
5 +X-next-at: 6e70778dc91e2139466c15ff15a02a22a2ada2d1
6
7 -What's cooking in git.git (Oct 2021, #01; Mon, 4)
7 +What's cooking in git.git (Oct 2021, #02; Wed, 6)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -18,8 +18,7 @@ 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'.
21 +The eleventh batch is in.
22
23 Copies of the source code to Git live in many repositories, and the
24 following is a list of the ones I push into or their mirrors. Some
@@ -52,172 +51,185 @@ Release tarballs are available at:
51 --------------------------------------------------
52 [Graduated to 'master']
53
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.
54 +* ab/repo-settings-cleanup (2021-09-22) 5 commits
55 + (merged to 'next' on 2021-09-28 at 43d70c31e1)
56 + + repository.h: don't use a mix of int and bitfields
57 + + repo-settings.c: simplify the setup
58 + + read-cache & fetch-negotiator: check "enum" values in switch()
59 + + environment.c: remove test-specific "ignore_untracked..." variable
60 + + wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
61
62 + Code cleanup.
63
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
64
66 - Doc update.
65 +* ab/retire-decl-of-missing-unused-funcs (2021-10-01) 4 commits
66 + (merged to 'next' on 2021-10-03 at a49287eaa9)
67 + + config.h: remove unused git_config_get_untracked_cache() declaration
68 + + log-tree.h: remove unused function declarations
69 + + grep.h: remove unused grep_threads_ok() declaration
70 + + builtin.h: remove cmd_tar_tree() declaration
71
72 + Remove external declaration of functions that no longer exist.
73
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
74
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.
75 +* ab/retire-refs-unused-funcs (2021-09-28) 5 commits
76 + (merged to 'next' on 2021-10-03 at f91e74fa7d)
77 + + refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
78 + + refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
79 + + refs/ref-cache.[ch]: remove unused add_ref_entry()
80 + + refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
81 + + refs.[ch]: remove unused ref_storage_backend_exists()
82
83 + Code cleanup.
84
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
85
82 - Build update.
86 +* ab/retire-string-list-init (2021-09-28) 1 commit
87 + (merged to 'next' on 2021-10-03 at 4834949cc3)
88 + + string-list.[ch]: remove string_list_init() compatibility function
89
90 + Code cleanup.
91
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.)
92
102 - Continued work on top of the hn/refs-errno-cleanup topic.
93 +* ew/midx-doc-update (2021-09-24) 1 commit
94 + (merged to 'next' on 2021-09-28 at f2cbe598eb)
95 + + doc/technical: update note about core.multiPackIndex
96
97 + Doc tweak.
98
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
99
109 - Protocol v0 clients can get stuck parsing a malformed feature line.
100 +* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
101 + (merged to 'next' on 2021-09-29 at b7dea55eae)
102 + + MyFirstContribution: Document --range-diff option when writing v2
103
104 + Doc update.
105
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
106
116 - Message tweak.
107 +* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
108 + (merged to 'next' on 2021-09-28 at 1660a6be89)
109 + + grep: store grep_source buffer as const
110 + + grep: mark "haystack" buffers as const
111 + + grep: stop modifying buffer in grep_source_1()
112 + + grep: stop modifying buffer in show_line()
113 + + grep: stop modifying buffer in strip_timestamp
114 + (this branch is used by hm/paint-hits-in-log-grep.)
115
116 + Code clean-up in the "grep" machinery.
117
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
118
123 - Help text for "ls-files" options have been updated.
119 +* jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
120 + (merged to 'next' on 2021-09-28 at 4d843448be)
121 + + revision: remove "submodule" from opt struct
122 + + repository: support unabsorbed in repo_submodule_init
123 + + submodule: remove unnecessary unabsorbed fallback
124 + (this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
125
126 + More code paths that use the hack to add submodule's object
127 + database to the set of alternate object store have been cleaned up.
128
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
129
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).
130 +* lh/systemd-timers (2021-09-27) 1 commit
131 + (merged to 'next' on 2021-10-03 at 81834609ea)
132 + + maintenance: fix test t7900-maintenance.sh
133
134 + Testfix.
135
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.)
136
142 - "git difftool --dir-diff" mishandled symbolic links.
137 +* os/status-docfix (2021-09-28) 1 commit
138 + (merged to 'next' on 2021-10-03 at a13019916a)
139 + + doc: fix capitalization in "git status --porcelain=v2" description
140
141 + Docfix.
142
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
143
149 - Perf test fix.
144 +* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
145 + (merged to 'next' on 2021-09-28 at 980add2a67)
146 + + rebase: dereference tags
147 + + rebase: use lookup_commit_reference_by_name()
148 + + rebase: use our standard error return value
149 + + t3407: rework rebase --quit tests
150 + + t3407: strengthen rebase --abort tests
151 + + t3407: use test_path_is_missing
152 + + t3407: rename a variable
153 + + t3407: use test_cmp_rev
154 + + t3407: use test_commit
155 + + t3407: run tests in $TEST_DIRECTORY
156 + (this branch is used by pw/fix-some-issues-in-reset-head.)
157
158 + "git rebase <upstream> <tag>" failed when aborted in the middle, as
159 + it mistakenly tried to write the tag object instead of peeling it
160 + to HEAD.
161
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
162
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.
163 +* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
164 + (merged to 'next' on 2021-09-28 at c67d5e383e)
165 + + rebase: fix todo-list rereading
166 + + sequencer.c: factor out a function
167
168 + The code to re-read the edited todo list in "git rebase -i" was
169 + made more robust.
170
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.)
171
171 - Futz with the way 'errno' is relied on in the refs API to carry the
172 - failure modes up the call chain.
172 +* tb/commit-graph-usage-fix (2021-09-22) 2 commits
173 + (merged to 'next' on 2021-09-28 at f021339c39)
174 + + builtin/multi-pack-index.c: disable top-level --[no-]progress
175 + + builtin/commit-graph.c: don't accept common --[no-]progress
176
177 + Regression in "git commit-graph" command line parsing has been
178 + corrected.
179
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
180
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.
181 +* ws/refer-to-forkpoint-config-in-rebase-doc (2021-09-20) 1 commit
182 + (merged to 'next' on 2021-09-29 at 49181eaafb)
183 + + Document `rebase.forkpoint` in rebase man page
184
185 + Doc update.
186
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 +[New Topics]
189
188 - Sensitive data in the HTTP trace were supposed to be redacted, but
189 - we failed to do so in HTTP/2 requests.
190 +* gc/use-repo-settings (2021-10-04) 3 commits
191 + - gc: perform incremental repack when implictly enabled
192 + - fsck: verify multi-pack-index when implictly enabled
193 + - fsck: verify commit graph when implicitly enabled
194
195 + It is wrong to read some settings directly from the config
196 + subsystem, as things like feature.experimental can affect their
197 + default values.
198
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
199 + Under review.
200 + cf. <70aca052-716f-40ed-47c4-1882fdbd221e@gmail.com>
201
196 - CI help for l10n.
202
203 +* jh/perf-remove-test-times (2021-10-04) 1 commit
204 + - t/perf/perf-lib.sh: remove test_times.* at the end test_perf_()
205
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()
206 + Perf test fix.
207
203 - Leakfix.
208 + Will merge to 'next'.
209
210 --------------------------------------------------
206 -[New Topics]
211 +[Stalled]
212
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
213 +* ar/submodule-update (2021-09-20) 8 commits
214 + . submodule--helper: rename helper functions
215 + . submodule--helper: remove unused helpers
216 + . submodule--helper: remove update-clone subcommand
217 + . submodule: move core cmd_update() logic to C
218 + . submodule--helper: refactor get_submodule_displaypath()
219 + . submodule--helper: rename helpers for update-clone
220 + . submodule--helper: get remote names from any repository
221 + . submodule--helper: split up ensure_core_worktree()
222
215 - Remove external declaration of functions that no longer exist.
223 + Rewrite of "git submodule update" in C.
224
217 - Will merge to 'master'.
225 + Kicked out of 'seen' to make room for es/superproject-aware-submodules
226 + which is among the topics this topic stomps on.
227
228 +--------------------------------------------------
229 +[Cooking]
230
220 -* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
231 +* pw/fix-some-issues-in-reset-head (2021-10-06) 13 commits
232 + - sparse index: fix use-after-free bug in cache_tree_verify()
233 - rebase -m: don't fork git checkout
234 - rebase --apply: set ORIG_HEAD correctly
235 - rebase --apply: fix reflog
@@ -230,7 +242,6 @@ Release tarballs are available at:
242 - reset_head(): fix checkout
243 - rebase: factor out checkout for up to date branch
244 - 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.)
245
246 Fix "some issues" in a helper function reset_head().
247
@@ -270,14 +281,15 @@ Release tarballs are available at:
281
282
283 * mr/bisect-in-c-4 (2021-10-01) 1 commit
273 - - bisect--helper: add space between colon and following sentence
284 + (merged to 'next' on 2021-10-06 at c13c14238d)
285 + + bisect--helper: add space between colon and following sentence
286
287 Message fix.
288
277 - Will merge to 'next'.
289 + Will merge to 'master'.
290
291
280 -* cm/save-restore-terminal (2021-10-04) 2 commits
292 +* cm/save-restore-terminal (2021-10-06) 2 commits
293 - editor: save and reset terminal after calling EDITOR
294 - terminal: teach git how to save/restore its terminal settings
295
@@ -290,51 +302,34 @@ Release tarballs are available at:
302
303
304 * rs/p3400-lose-tac (2021-10-03) 1 commit
293 - - p3400: stop using tac(1)
305 + (merged to 'next' on 2021-10-06 at 688dc7137c)
306 + + p3400: stop using tac(1)
307
308 Test portability update.
309
297 - Will merge to 'next'.
310 + Will merge to 'master'.
311
312
313 * 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
314 + (merged to 'next' on 2021-10-06 at 4de6571bf7)
315 + + Documentation/git-status: mention how to detect copies
316 + + Documentation/git-status: document porcelain status T (typechange)
317 + + Documentation/diff-format: state in which cases porcelain status is T
318 + + Documentation/git-status: remove impossible porcelain status DR and DC
319
320 A few kinds of changes "git status" can show were not described.
321
308 - Will merge to 'next'.
322 + Will merge to 'master'.
323
324
325 * tb/aggregate-ignore-leading-whitespaces (2021-10-04) 1 commit
312 - - t/perf/aggregate.perl: tolerate leading spaces
326 + (merged to 'next' on 2021-10-06 at 619a7db2d4)
327 + + t/perf/aggregate.perl: tolerate leading spaces
328
329 Test portability update.
330
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.
331 + Will merge to 'master'.
332
336 ---------------------------------------------------
337 -[Cooking]
333
334 * ab/designated-initializers (2021-09-27) 5 commits
335 (merged to 'next' on 2021-10-03 at 179f652de6)
@@ -361,25 +356,7 @@ Release tarballs are available at:
356
357 Code clean-up.
358
364 - Will merge to 'next'?
365 -
366 -
367 -* lh/systemd-timers (2021-09-27) 1 commit
368 - (merged to 'next' on 2021-10-03 at 81834609ea)
369 - + maintenance: fix test t7900-maintenance.sh
370 -
371 - Testfix.
372 -
373 - Will merge to 'master'.
374 -
375 -
376 -* os/status-docfix (2021-09-28) 1 commit
377 - (merged to 'next' on 2021-10-03 at a13019916a)
378 - + doc: fix capitalization in "git status --porcelain=v2" description
379 -
380 - Docfix.
381 -
382 - Will merge to 'master'.
359 + Will merge to 'next'.
360
361
362 * ab/parse-options-cleanup (2021-10-01) 11 commits
@@ -409,30 +386,9 @@ Release tarballs are available at:
386 Will merge to 'master'.
387
388
412 -* ab/retire-refs-unused-funcs (2021-09-28) 5 commits
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 -
422 - Will merge to 'master'.
423 -
424 -
425 -* ab/retire-string-list-init (2021-09-28) 1 commit
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 -
431 - Will merge to 'master'.
432 -
433 -
389 * mt/grep-submodule-textconv (2021-09-29) 1 commit
435 - - grep: demonstrate bug with textconv attributes and submodules
390 + (merged to 'next' on 2021-10-06 at 1950944b8c)
391 + + grep: demonstrate bug with textconv attributes and submodules
392
393 "git grep --recurse-submodules" takes trees and blobs from the
394 submodule repository, but the textconv settings when processing a
@@ -440,7 +396,7 @@ Release tarballs are available at:
396 A demonstration is added to demonstrate the issue, without fixing
397 it.
398
443 - Will merge to 'next'.
399 + Will merge to 'master'.
400
401
402 * es/superproject-aware-submodules (2021-08-19) 5 commits
@@ -479,22 +435,23 @@ Release tarballs are available at:
435 "git fsck" has been taught to report mismatch between expected and
436 actual types of an object better.
437
482 - Will merge to 'next'?
438 + Will merge to 'next'.
439
440
441 * 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()"
488 - - hook.c: add a hook_exists() wrapper and use it in bugreport.c
489 - - hook.[ch]: move find_hook() from run-command.c to hook.c
490 - - Makefile: remove an out-of-date comment
491 - - Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
492 - - Makefile: stop hardcoding {command,config}-list.h
493 - - Makefile: mark "check" target as .PHONY
442 + (merged to 'next' on 2021-10-06 at d05325ed35)
443 + + hook-list.h: add a generated list of hooks, like config-list.h
444 + + hook.c users: use "hook_exists()" instead of "find_hook()"
445 + + hook.c: add a hook_exists() wrapper and use it in bugreport.c
446 + + hook.[ch]: move find_hook() from run-command.c to hook.c
447 + + Makefile: remove an out-of-date comment
448 + + Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
449 + + Makefile: stop hardcoding {command,config}-list.h
450 + + Makefile: mark "check" target as .PHONY
451
452 Mostly preliminary clean-up in the hook API.
453
497 - Will merge to 'next'.
454 + Will merge to 'master'.
455
456
457 * ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
@@ -532,40 +489,6 @@ Release tarballs are available at:
489 Will merge to 'master'.
490
491
535 -* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
536 - (merged to 'next' on 2021-09-28 at c67d5e383e)
537 - + rebase: fix todo-list rereading
538 - + sequencer.c: factor out a function
539 -
540 - The code to re-read the edited todo list in "git rebase -i" was
541 - made more robust.
542 -
543 - Will merge to 'master'.
544 -
545 -
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
549 -
550 - Doc update.
551 -
552 - Will merge to 'master'.
553 -
554 -
555 -* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
556 - (merged to 'next' on 2021-09-28 at 1660a6be89)
557 - + grep: store grep_source buffer as const
558 - + grep: mark "haystack" buffers as const
559 - + grep: stop modifying buffer in grep_source_1()
560 - + grep: stop modifying buffer in show_line()
561 - + grep: stop modifying buffer in strip_timestamp
562 - (this branch is used by hm/paint-hits-in-log-grep.)
563 -
564 - Code clean-up in the "grep" machinery.
565 -
566 - Will merge to 'master'.
567 -
568 -
492 * js/win-lazyload-buildfix (2021-09-28) 3 commits
493 (merged to 'next' on 2021-10-03 at 26802e5d73)
494 + Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
@@ -578,20 +501,12 @@ Release tarballs are available at:
501
502
503 * ab/make-sparse-for-real (2021-09-22) 1 commit
581 - - Makefile: make the "sparse" target non-.PHONY
504 + (merged to 'next' on 2021-10-06 at 10e3c31d6a)
505 + + Makefile: make the "sparse" target non-.PHONY
506
507 Prevent "make sparse" from running for the source files that
508 haven't been modified.
509
586 - Will merge to 'next'?
587 -
588 -
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
592 -
593 - Doc tweak.
594 -
510 Will merge to 'master'.
511
512
@@ -606,12 +521,14 @@ Release tarballs are available at:
521 - refs: plumb repo into ref stores
522 - Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
523 - Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
609 - (this branch uses jk/ref-paranoia and jt/add-submodule-odb-clean-up.)
524 + (this branch uses jk/ref-paranoia.)
525
526 Follow through the work to use the repo interface to access
527 submodule objects in-process, instead of abusing the alternate
528 object database interface.
529
530 + Expecting a reroll.
531 +
532
533 * tp/send-email-completion (2021-09-22) 3 commits
534 - send-email docs: add format-patch options
@@ -629,25 +546,12 @@ Release tarballs are available at:
546 - pretty: colorize pattern matches in commit messages
547 - grep: refactor next_match() and match_one_pattern() for external use
548 - Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep
632 - (this branch uses jk/grep-haystack-is-read-only.)
549
550 "git log --grep=string --author=name" learns to highlight hits just
551 like "git grep string" does.
552
637 - Will merge to 'next'?
638 -
639 -
640 -* ab/repo-settings-cleanup (2021-09-22) 5 commits
641 - (merged to 'next' on 2021-09-28 at 43d70c31e1)
642 - + repository.h: don't use a mix of int and bitfields
643 - + repo-settings.c: simplify the setup
644 - + read-cache & fetch-negotiator: check "enum" values in switch()
645 - + environment.c: remove test-specific "ignore_untracked..." variable
646 - + wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
647 -
648 - Code cleanup.
649 -
650 - Will merge to 'master'.
553 + Expecting a reroll.
554 + cf. <87v92bju64.fsf@evledraar.gmail.com>
555
556
557 * da/difftool (2021-09-30) 6 commits
@@ -665,22 +569,23 @@ Release tarballs are available at:
569
570
571 * en/removing-untracked-fixes (2021-09-27) 12 commits
668 - - Documentation: call out commands that nuke untracked files/directories
669 - - Comment important codepaths regarding nuking untracked files/dirs
670 - - unpack-trees: avoid nuking untracked dir in way of locally deleted file
671 - - unpack-trees: avoid nuking untracked dir in way of unmerged file
672 - - Change unpack_trees' 'reset' flag into an enum
673 - - Remove ignored files by default when they are in the way
674 - - unpack-trees: make dir an internal-only struct
675 - - unpack-trees: introduce preserve_ignored to unpack_trees_options
676 - - read-tree, merge-recursive: overwrite ignored files by default
677 - - checkout, read-tree: fix leak of unpack_trees_options.dir
678 - - t2500: add various tests for nuking untracked files
679 - - Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
572 + (merged to 'next' on 2021-10-06 at fc4e387fda)
573 + + Documentation: call out commands that nuke untracked files/directories
574 + + Comment important codepaths regarding nuking untracked files/dirs
575 + + unpack-trees: avoid nuking untracked dir in way of locally deleted file
576 + + unpack-trees: avoid nuking untracked dir in way of unmerged file
577 + + Change unpack_trees' 'reset' flag into an enum
578 + + Remove ignored files by default when they are in the way
579 + + unpack-trees: make dir an internal-only struct
580 + + unpack-trees: introduce preserve_ignored to unpack_trees_options
581 + + read-tree, merge-recursive: overwrite ignored files by default
582 + + checkout, read-tree: fix leak of unpack_trees_options.dir
583 + + t2500: add various tests for nuking untracked files
584 + + Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
585
586 Various fixes in code paths that move untracked files away to make room.
587
683 - Will merge to 'next'.
588 + Will merge to 'master'.
589
590
591 * ks/submodule-add-message-fix (2021-09-20) 1 commit
@@ -692,26 +597,6 @@ Release tarballs are available at:
597 cf. <m27df9lvm1.fsf@gmail.com>
598
599
695 -* tb/commit-graph-usage-fix (2021-09-22) 2 commits
696 - (merged to 'next' on 2021-09-28 at f021339c39)
697 - + builtin/multi-pack-index.c: disable top-level --[no-]progress
698 - + builtin/commit-graph.c: don't accept common --[no-]progress
699 -
700 - Regression in "git commit-graph" command line parsing has been
701 - corrected.
702 -
703 - Will merge to 'master'.
704 -
705 -
706 -* ws/refer-to-forkpoint-config-in-rebase-doc (2021-09-20) 1 commit
707 - (merged to 'next' on 2021-09-29 at 49181eaafb)
708 - + Document `rebase.forkpoint` in rebase man page
709 -
710 - Doc update.
711 -
712 - Will merge to 'master'.
713 -
714 -
600 * ns/batched-fsync (2021-10-04) 9 commits
601 . core.fsyncobjectfiles: performance tests for add and stash
602 . core.fsyncobjectfiles: tests for batch mode
@@ -733,86 +618,91 @@ Release tarballs are available at:
618
619
620 * jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits
736 - - t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
737 - - run-command: create start_bg_command
738 - - simple-ipc/ipc-win32: add Windows ACL to named pipe
739 - - simple-ipc/ipc-win32: add trace2 debugging
740 - - simple-ipc: move definition of ipc_active_state outside of ifdef
741 - - simple-ipc: preparations for supporting binary messages.
742 - - trace2: add trace2_child_ready() to report on background children
621 + (merged to 'next' on 2021-10-06 at 021f633b9c)
622 + + t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
623 + + run-command: create start_bg_command
624 + + simple-ipc/ipc-win32: add Windows ACL to named pipe
625 + + simple-ipc/ipc-win32: add trace2 debugging
626 + + simple-ipc: move definition of ipc_active_state outside of ifdef
627 + + simple-ipc: preparations for supporting binary messages.
628 + + trace2: add trace2_child_ready() to report on background children
629
630 Built-in fsmonitor (part 1).
631
746 - Will merge to 'next'.
632 + Will merge to 'master'.
633
634
635 * ab/align-parse-options-help (2021-09-22) 4 commits
750 - - parse-options: properly align continued usage output
751 - - git rev-parse --parseopt tests: add more usagestr tests
752 - - send-pack: properly use parse_options() API for usage string
753 - - parse-options API users: align usage output in C-strings
636 + (merged to 'next' on 2021-10-06 at e22da7ef85)
637 + + parse-options: properly align continued usage output
638 + + git rev-parse --parseopt tests: add more usagestr tests
639 + + send-pack: properly use parse_options() API for usage string
640 + + parse-options API users: align usage output in C-strings
641
642 When "git cmd -h" shows more than one line of usage text (e.g.
643 the cmd subcommand may take sub-sub-command), parse-options API
644 learned to align these lines, even across i18n/l10n.
645
759 - Will merge to 'next'?
646 + Will merge to 'master'.
647
648
649 * ab/help-config-vars (2021-09-23) 9 commits
763 - - help: move column config discovery to help.c library
764 - - help / completion: make "git help" do the hard work
765 - - help tests: test --config-for-completion option & output
766 - - help: simplify by moving to OPT_CMDMODE()
767 - - help: correct logic error in combining --all and --guides
768 - - help: correct logic error in combining --all and --config
769 - - help tests: add test for --config output
770 - - help: correct usage & behavior of "git help --guides"
771 - - help: correct the usage string in -h and documentation
650 + (merged to 'next' on 2021-10-06 at bf9538cfbd)
651 + + help: move column config discovery to help.c library
652 + + help / completion: make "git help" do the hard work
653 + + help tests: test --config-for-completion option & output
654 + + help: simplify by moving to OPT_CMDMODE()
655 + + help: correct logic error in combining --all and --guides
656 + + help: correct logic error in combining --all and --config
657 + + help tests: add test for --config output
658 + + help: correct usage & behavior of "git help --guides"
659 + + help: correct the usage string in -h and documentation
660
661 Teach "git help -c" into helping the command line completion of
662 configuration variables.
663
776 - Will merge to 'next'?
664 + Will merge to 'master'.
665
666
667 * 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
783 - - builtin/repack.c: extract showing progress to a variable
784 - - builtin/repack.c: rename variables that deal with non-kept packs
785 - - builtin/repack.c: keep track of existing packs unconditionally
786 - - midx: preliminary support for `--refs-snapshot`
787 - - builtin/multi-pack-index.c: support `--stdin-packs` mode
788 - - midx: expose `write_midx_file_only()` publicly
668 + (merged to 'next' on 2021-10-06 at ccdd5aaf2a)
669 + + builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
670 + + builtin/repack.c: make largest pack preferred
671 + + builtin/repack.c: support writing a MIDX while repacking
672 + + builtin/repack.c: extract showing progress to a variable
673 + + builtin/repack.c: rename variables that deal with non-kept packs
674 + + builtin/repack.c: keep track of existing packs unconditionally
675 + + midx: preliminary support for `--refs-snapshot`
676 + + builtin/multi-pack-index.c: support `--stdin-packs` mode
677 + + midx: expose `write_midx_file_only()` publicly
678
679 "git repack" has been taught to generate multi-pack reachability
680 bitmaps.
681
793 - Will merge to 'next'?
682 + Will merge to 'master'.
683
684
685 * ds/add-rm-with-sparse-index (2021-09-28) 13 commits
797 - - advice: update message to suggest '--sparse'
798 - - mv: refuse to move sparse paths
799 - - rm: skip sparse paths with missing SKIP_WORKTREE
800 - - rm: add --sparse option
801 - - add: update --renormalize to skip sparse paths
802 - - add: update --chmod to skip sparse paths
803 - - add: implement the --sparse option
804 - - add: skip tracked paths outside sparse-checkout cone
805 - - add: fail when adding an untracked sparse file
806 - - dir: fix pattern matching on dirs
807 - - dir: select directories correctly
808 - - t1092: behavior for adding sparse files
809 - - t3705: test that 'sparse_entry' is unstaged
686 + (merged to 'next' on 2021-10-06 at 80a9cda797)
687 + + advice: update message to suggest '--sparse'
688 + + mv: refuse to move sparse paths
689 + + rm: skip sparse paths with missing SKIP_WORKTREE
690 + + rm: add --sparse option
691 + + add: update --renormalize to skip sparse paths
692 + + add: update --chmod to skip sparse paths
693 + + add: implement the --sparse option
694 + + add: skip tracked paths outside sparse-checkout cone
695 + + add: fail when adding an untracked sparse file
696 + + dir: fix pattern matching on dirs
697 + + dir: select directories correctly
698 + + t1092: behavior for adding sparse files
699 + + t3705: test that 'sparse_entry' is unstaged
700
701 "git add", "git mv", and "git rm" have been adjusted to avoid
702 updating paths outside of the sparse-checkout definition unless
703 the user specifies a "--sparse" option.
704
815 - Will merge to 'next'.
705 + Will merge to 'master'.
706
707
708 * tb/midx-write-propagate-namehash (2021-09-17) 7 commits
@@ -831,27 +721,6 @@ Release tarballs are available at:
721 Will merge to 'master'.
722
723
834 -* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
835 - (merged to 'next' on 2021-09-28 at 980add2a67)
836 - + rebase: dereference tags
837 - + rebase: use lookup_commit_reference_by_name()
838 - + rebase: use our standard error return value
839 - + t3407: rework rebase --quit tests
840 - + t3407: strengthen rebase --abort tests
841 - + t3407: use test_path_is_missing
842 - + t3407: rename a variable
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
850 - to HEAD.
851 -
852 - Will merge to 'master'.
853 -
854 -
724 * en/zdiff3 (2021-09-20) 2 commits
725 - update documentation for new zdiff3 conflictStyle
726 - xdiff: implement a zealous diff3, or "zdiff3"
@@ -859,19 +728,6 @@ Release tarballs are available at:
728 "Zealous diff3" style of merge conflict presentation has been added.
729
730
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
865 - + repository: support unabsorbed in repo_submodule_init
866 - + submodule: remove unnecessary unabsorbed fallback
867 - (this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
868 -
869 - More code paths that use the hack to add submodule's object
870 - database to the set of alternate object store have been cleaned up.
871 -
872 - Will merge to 'master'.
873 -
874 -
731 * js/scalar (2021-09-14) 15 commits
732 - scalar: accept -C and -c options before the subcommand
733 - scalar: implement the `version` command
@@ -977,19 +833,20 @@ Release tarballs are available at:
833
834
835 * ab/lib-subtest (2021-09-22) 9 commits
980 - - test-lib tests: get rid of copy/pasted mock test code
981 - - test-lib tests: assert 1 exit code, not non-zero
982 - - test-lib tests: refactor common part of check_sub_test_lib_test*()
983 - - test-lib tests: avoid subshell for "test_cmp" for readability
984 - - test-lib tests: don't provide a description for the sub-tests
985 - - test-lib tests: split up "write and run" into two functions
986 - - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
987 - - Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
988 - - Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
836 + (merged to 'next' on 2021-10-06 at e8fa261811)
837 + + test-lib tests: get rid of copy/pasted mock test code
838 + + test-lib tests: assert 1 exit code, not non-zero
839 + + test-lib tests: refactor common part of check_sub_test_lib_test*()
840 + + test-lib tests: avoid subshell for "test_cmp" for readability
841 + + test-lib tests: don't provide a description for the sub-tests
842 + + test-lib tests: split up "write and run" into two functions
843 + + test-lib tests: move "run_sub_test" to a new lib-subtest.sh
844 + + Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
845 + + Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
846
847 Updates to the tests in t0000 to test the test framework.
848
992 - Will merge to 'next'.
849 + Will merge to 'master'.
850
851
852 * ab/only-single-progress-at-once (2021-09-22) 8 commits
@@ -1018,7 +875,7 @@ Release tarballs are available at:
875
876 Use ssh public crypto for object and push-cert signing.
877
1021 - Will merge to 'next'?
878 + Will merge to 'next'.
879
880
881 * cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
@@ -1253,5 +1110,3 @@ Release tarballs are available at:
1110 Test portability update.
1111
1112 The tb/aggregate-ignore-leading-whitespaces supersedes this topic.
1256 -
1257 -