What's cooking (2023/01 #01)
Junio C Hamano committed
Jan 2, 2023 at 22:35 UTC
cc6870a8704be778fe2d707b1a4ac51f840526f8
1 file changed
+195
-429
whats-cooking.txt
+195
-429
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2022, #07; Mon, 26)
3
-X-master-at: 8a4e8f6a67e7fc97048d4666eec38399b88e0e3b
4
-X-next-at: 74172e4df8f68fd7c75fe67b318b8724dbc29762
2
+Subject: What's cooking in git.git (Jan 2023, #01; Mon, 2)
3
+X-master-at: 2b4f5a4e4bb102ac8d967cea653ed753b608193c
4
+X-next-at: 7cf837fe5f11ff7b613db06ba8547786c6d37bd9
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2022, #07; Mon, 26)
7
+What's cooking in git.git (Jan 2023, #01; Mon, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -43,78 +43,43 @@ Release tarballs are available at:
43
https://www.kernel.org/pub/software/scm/git/
44
45
--------------------------------------------------
46
-[New Topics]
47
-
48
-* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
49
- - tests: don't lose misc "git" exit codes
50
- - tests: don't lose "git" exit codes in "! ( git ... | grep )"
51
- - tests: don't lose exit status with "test <op> $(git ...)"
52
- - tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
53
- - t/lib-patch-mode.sh: fix ignored exit codes
54
- - auto-crlf tests: don't lose exit code in loops and outside tests
55
-
56
- Test clean-up.
57
-
58
- Will merge to 'next'?
59
- source: <cover-v4-0.6-00000000000-20221219T101240Z-avarab@gmail.com>
60
-
61
-
62
-* cw/ci-whitespace (2022-12-20) 3 commits
63
- - ci (check-whitespace): move to actions/checkout@v3
64
- - ci (check-whitespace): add links to job output
65
- - ci (check-whitespace): suggest fixes for errors
66
-
67
- CI updates.
68
-
69
- Will merge to 'next'?
70
- source: <pull.1444.v2.git.1671496548.gitgitgadget@gmail.com>
71
-
72
-
73
-* dh/mingw-ownership-check-typofix (2022-12-20) 1 commit
74
- - mingw: fix typo in an error message from ownership check
75
-
76
- Error message typofix.
77
-
78
- Will merge to 'next'?
79
- source: <pull.1393.git.git.1671416810927.gitgitgadget@gmail.com>
80
-
81
-
82
-* js/ci-disable-cmake-by-default (2022-12-20) 1 commit
83
- - ci: only run win+VS build & tests in Git for Windows' fork
84
-
85
- Stop running win+VS build by default.
86
-
87
- Will merge to 'next'?
88
- source: <pull.1445.git.1671461414191.gitgitgadget@gmail.com>
89
-
90
-
91
-* sg/test-oid-wo-incomplete-line (2022-12-19) 1 commit
92
- - tests: make 'test_oid' print trailing newline
93
-
94
- Test helper updates.
95
-
96
- Will merge to 'next'?
97
- source: <20221218162905.3508164-1-szeder.dev@gmail.com>
46
+[Graduated to 'master']
47
48
+* ds/bundle-uri-4 (2022-12-25) 11 commits
49
+ (merged to 'next' on 2022-12-26 at 6d7c21c44a)
50
+ + clone: unbundle the advertised bundles
51
+ + bundle-uri: download bundles from an advertised list
52
+ + bundle-uri: allow relative URLs in bundle lists
53
+ + strbuf: introduce strbuf_strip_file_from_path()
54
+ + bundle-uri: serve bundle.* keys from config
55
+ + bundle-uri client: add helper for testing server
56
+ + transport: rename got_remote_heads
57
+ + bundle-uri client: add boolean transfer.bundleURI setting
58
+ + clone: request the 'bundle-uri' command when available
59
+ + t: create test harness for 'bundle-uri' command
60
+ + protocol v2: add server-side "bundle-uri" skeleton
61
100
-* ab/bundle-wo-args (2022-12-25) 1 commit
101
- (merged to 'next' on 2022-12-26 at b086677fd0)
102
- + bundle: don't segfault on "git bundle <subcmd>"
62
+ Bundle URIs part 4.
63
+ source: <pull.1400.v4.git.1671722058.gitgitgadget@gmail.com>
64
104
- Fix to a small regression in 2.38 days.
65
106
- Will merge to 'master'.
107
- source: <patch-1.1-2319eb2ddbd-20221220T133941Z-avarab@gmail.com>
66
+* ew/format-patch-mboxrd (2022-12-25) 1 commit
67
+ (merged to 'next' on 2022-12-26 at bb6cc9e207)
68
+ + format-patch: support format.mboxrd with --stdout
69
70
+ "git format-patch" learned to honor format.mboxrd even when sending
71
+ patches to the standard output stream,
72
+ source: <20221222201619.M435985@dcvr>
73
110
-* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
111
- - test-lib: allow storing counts with test harnesses
74
113
- Allow summary results from tests to be written to t/test-results
114
- directory even when a test harness like 'prove' is in use.
75
+* lk/line-range-parsing-fix (2022-12-20) 1 commit
76
+ (merged to 'next' on 2022-12-26 at 216226a6e2)
77
+ + line-range: fix infinite loop bug with '$' regex
78
116
- Comments?
117
- source: <20221224225200.1027806-1-adam@dinwoodie.org>
79
+ When given a pattern that matches an empty string at the end of a
80
+ line, the code to parse the "git diff" line-ranges fell into an
81
+ infinite loop, which has been corrected.
82
+ source: <20221219224850.2703967-1-lars@oddbit.com>
83
84
85
* ps/fsync-refs-fix (2022-12-25) 1 commit
@@ -123,302 +88,208 @@ Release tarballs are available at:
88
89
Fix the sequence to fsync $GIT_DIR/packed-refs file that forgot to
90
flush its output to the disk..
126
-
127
- Will merge to 'master'.
91
source: <8c8ecf8e3718cbca049ee7a283edd7b7887e464e.1671547905.git.ps@pks.im>
92
93
94
+* sa/git-var-sequence-editor (2022-12-18) 1 commit
95
+ (merged to 'next' on 2022-12-20 at a5737674b6)
96
+ + var: add GIT_SEQUENCE_EDITOR variable
97
+
98
+ Just like "git var GIT_EDITOR" abstracts the complex logic to
99
+ choose which editor gets used behind it, "git var" now give support
100
+ to GIT_SEQUENCE_EDITOR.
101
+ source: <pull.1424.v2.git.1671318599482.gitgitgadget@gmail.com>
102
+
103
+
104
* sk/win32-pthread-exit-fix (2022-12-25) 1 commit
105
(merged to 'next' on 2022-12-26 at ebcb1fef4c)
106
+ win32: use _endthreadex to terminate threads, not ExitThread
107
108
An API emulation fix.
136
-
137
- Will merge to 'master'.
109
source: <pull.1414.v2.git.git.1671932510529.gitgitgadget@gmail.com>
110
111
141
-* sk/win32-close-handle-upon-pthread-join (2022-12-26) 2 commits
142
- - win32: close handles of threads that have been joined
143
- - win32-pthread: prepare pthread.c for change by formatting
112
+* ss/pull-v-recurse-fix (2022-12-18) 1 commit
113
+ (merged to 'next' on 2022-12-20 at 21f91dc75d)
114
+ + submodule: accept -v for the update command
115
145
- source: <pull.1406.v12.git.git.1671932405.gitgitgadget@gmail.com>
116
+ "git pull -v --recurse-submodules" attempted to pass "-v" down to
117
+ underlying "git submodule update", which did not understand the
118
+ request and barfed, which has been corrected.
119
+ source: <f805f2da-a7e1-9fde-cc0a-04a30f79c9af@cs-ware.de>
120
121
--------------------------------------------------
148
-[Graduated to 'master']
149
-
150
-* ab/darwin-default-to-sha1dc (2022-12-16) 1 commit
151
- (merged to 'next' on 2022-12-16 at 31fb33b832)
152
- + Makefile: use sha1collisiondetection by default on OSX and Darwin
153
-
154
- Use the SHA1DC implementation on macOS, just like other platforms,
155
- by default.
156
- source: <patch-v2-1.1-3de7cdbd260-20221215T084129Z-avarab@gmail.com>
157
-
158
-
159
-* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
160
- (merged to 'next' on 2022-12-16 at 75c7a06930)
161
- + t4023: fix ignored exit codes of git
162
-
163
- Test fix.
164
- source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>
165
-
166
-
167
-* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
168
- (merged to 'next' on 2022-12-16 at 40f3acd249)
169
- + t5314: check exit code of "git"
170
-
171
- Test fix.
172
- source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>
173
-
174
-
175
-* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
176
- (merged to 'next' on 2022-12-16 at ef89e4f2d1)
177
- + t7600: don't ignore "rev-parse" exit code in helper
178
-
179
- Test fix.
180
- source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
181
-
182
-
183
-* aw/complete-case-insensitive (2022-11-30) 2 commits
184
- (merged to 'next' on 2022-12-16 at 341974c2bb)
185
- + completion: add case-insensitive match of pseudorefs
186
- + completion: add optional ignore-case when matching refs
187
-
188
- Introduce a case insensitive mode to the Bash completion helpers.
189
- source: <pull.1374.v2.git.git.1668990419.gitgitgadget@gmail.com>
190
-
191
-
192
-* jh/fsmonitor-darwin-modernize (2022-12-15) 1 commit
193
- (merged to 'next' on 2022-12-16 at 197e1f8c43)
194
- + fsmonitor: eliminate call to deprecated FSEventStream function
195
-
196
- Stop using deprecated macOS API in fsmonitor.
197
- source: <pull.1436.v2.git.1671045153981.gitgitgadget@gmail.com>
198
-
199
-
200
-* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
201
- (merged to 'next' on 2022-12-16 at d64198c6c3)
202
- + fsmonitor: fix race seen in t7527
203
-
204
- Make fsmonitor more robust to avoid the flakiness seen in t7527.
205
- source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>
206
-
207
-
208
-* jk/avoid-redef-system-functions (2022-12-05) 3 commits
209
- (merged to 'next' on 2022-12-16 at 55f7102dba)
210
- + Merge branch 'jk/avoid-redef-system-functions-2.30' into jk/avoid-redef-system-functions
211
- + Merge branch 'jk/avoid-redef-system-functions-2.30'
212
- + Merge branch 'jk/avoid-redef-system-functions-2.30' into maint
213
- (this branch uses jk/avoid-redef-system-functions-2.30.)
214
-
215
- The jk/avoid-redef-system-functions-2.30 topic pre-merged for more
216
- recent codebase.
217
-
218
-
219
-* jk/avoid-redef-system-functions-2.30 (2022-12-05) 2 commits
220
- (merged to 'next' on 2022-12-16 at aa101dfc0c)
221
- + git-compat-util: undefine system names before redeclaring them
222
- + git-compat-util: avoid redefining system function names
223
- (this branch is used by jk/avoid-redef-system-functions.)
224
-
225
- Redefining system functions for a few functions did not follow our
226
- usual "implement git_foo() and #define foo(args) git_foo(args)"
227
- pattern, which has broken build for some folks.
228
- source: <Y4fH4rhcSztHwKvK@coredump.intra.peff.net>
229
-
230
-
231
-* jk/ref-filter-error-reporting-fix (2022-12-15) 5 commits
232
- (merged to 'next' on 2022-12-16 at 8135d51462)
233
- + ref-filter: convert email atom parser to use err_bad_arg()
234
- + ref-filter: truncate atom names in error messages
235
- + ref-filter: factor out "unrecognized %(foo) arg" errors
236
- + ref-filter: factor out "%(foo) does not take arguments" errors
237
- + ref-filter: reject arguments to %(HEAD)
238
-
239
- Clean-ups in error messages produced by "git for-each-ref" and friends.
240
- source: <Y5n3S7cnD7s/AIRL@coredump.intra.peff.net>
241
-
242
-
243
-* jk/server-supports-v2-cleanup (2022-12-13) 1 commit
244
- (merged to 'next' on 2022-12-16 at 9b995dc263)
245
- + server_supports_v2(): use a separate function for die_on_error
246
-
247
- Code clean-up.
248
- source: <Y5hZirNRGLQUZfOZ@coredump.intra.peff.net>
249
-
250
-
251
-* jk/unused-post-2.39 (2022-12-13) 9 commits
252
- (merged to 'next' on 2022-12-16 at 4ce4a868e5)
253
- + userdiff: mark unused parameter in internal callback
254
- + list-objects-filter: mark unused parameters in virtual functions
255
- + diff: mark unused parameters in callbacks
256
- + xdiff: mark unused parameter in xdl_call_hunk_func()
257
- + xdiff: drop unused parameter in def_ff()
258
- + ws: drop unused parameter from ws_blank_line()
259
- + list-objects: drop process_gitlink() function
260
- + blob: drop unused parts of parse_blob_buffer()
261
- + ls-refs: use repository parameter to iterate refs
262
-
263
- Code clean-up around unused function parameters.
264
- source: <Y5hdvpbLpXySHFRz@coredump.intra.peff.net>
265
-
122
+[New Topics]
123
267
-* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
268
- (merged to 'next' on 2022-12-16 at 59536ed758)
269
- + t3920: don't ignore errors of more than one command with `|| true`
270
- (this branch is used by rs/t3920-crlf-eating-grep-fix.)
124
+* km/doc-branch-start-point (2022-12-27) 1 commit
125
+ (merged to 'next' on 2022-12-28 at 0c24f1cd9b)
126
+ + doc/git-branch: fix --force description typo
127
272
- Test fix.
273
- source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
128
+ Typofix.
129
130
+ Will merge to 'master'.
131
+ source: <20221226165441.126625-1-kyle@kyleam.com>
132
276
-* jt/http-fetch-trace2-report-name (2022-12-13) 1 commit
277
- (merged to 'next' on 2022-12-16 at b26e38cdb2)
278
- + http-fetch: invoke trace2_cmd_name()
133
280
- "git http-fetch" (which is rarely used) forgot to identify itself
281
- in the trace2 output.
282
- source: <20221212224630.2553391-1-jonathantanmy@google.com>
134
+* ar/typofix-gitattributes-doc (2022-12-28) 1 commit
135
+ (merged to 'next' on 2022-12-28 at e193a15659)
136
+ + gitattributes.txt: fix typo in "comma separated"
137
138
+ Typofix.
139
285
-* pg/diff-stat-unmerged-regression-fix (2022-12-15) 1 commit
286
- (merged to 'next' on 2022-12-16 at 2a61376847)
287
- + diff: fix regression with --stat and unmerged file
140
+ Will merge to 'master'.
141
+ source: <20221227210156.1532168-1-rybak.a.v@gmail.com>
142
289
- The output from "git diff --stat" on an unmerged path lost the
290
- terminating LF in Git 2.39, which has been corrected.
291
- source: <20221214174150.404821-1-pete@jpgrayson.net>
143
144
+* ab/various-leak-fixes (2022-12-30) 20 commits
145
+ - push: free_refs() the "local_refs" in set_refspecs()
146
+ - receive-pack: free() the "ref_name" in "struct command"
147
+ - grep API: plug memory leaks by freeing "header_list"
148
+ - grep.c: refactor free_grep_patterns()
149
+ - object-file.c: release the "tag" in check_tag()
150
+ - connected.c: free(new_pack) in check_connected()
151
+ - builtin/merge.c: free "&buf" on "Your local changes..." error
152
+ - builtin/merge.c: always free "struct strbuf msg"
153
+ - show-branch: free() allocated "head" before return
154
+ - commit-graph: fix a parse_options_concat() leak
155
+ - http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
156
+ - http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
157
+ - worktree: fix a trivial leak in prune_worktrees()
158
+ - repack: fix leaks on error with "goto cleanup"
159
+ - name-rev: don't xstrdup() an already dup'd string
160
+ - various: add missing clear_pathspec(), fix leaks
161
+ - clone: use free() instead of UNLEAK()
162
+ - commit-graph: use free() instead of UNLEAK()
163
+ - bundle.c: don't leak the "args" in the "struct child_process"
164
+ - tests: mark tests as passing with SANITIZE=leak
165
294
-* rj/branch-copy-and-rename (2022-11-17) 1 commit
295
- (merged to 'next' on 2022-12-16 at b88fa41a8a)
296
- + branch: force-copy a branch to itself via @{-1} is a no-op
166
+ source: <cover-v2-00.20-00000000000-20221230T020341Z-avarab@gmail.com>
167
298
- Fix a pair of bugs in 'git branch'.
299
- source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>
168
169
+* rj/branch-unborn-in-other-worktrees (2023-01-01) 2 commits
170
+ - branch: rename orphan branches in any worktree
171
+ - branch: description for orphan branch errors
172
302
-* rr/status-untracked-advice (2022-12-01) 1 commit
303
- (merged to 'next' on 2022-12-16 at bed7d84d07)
304
- + status: modernize git-status "slow untracked files" advice
173
+ source: <ffd675e9-8a64-ae05-fc3b-36ae99092735@gmail.com>
174
306
- The advice message given by "git status" when it takes long time to
307
- enumerate untracked paths has been updated.
308
- source: <pull.1384.v9.git.1669769536707.gitgitgadget@gmail.com>
175
176
+* rs/dup-array (2023-01-02) 4 commits
177
+ - use DUP_ARRAY
178
+ - add DUP_ARRAY
179
+ - do full type check in BARF_UNLESS_COPYABLE
180
+ - factor out BARF_UNLESS_COPYABLE
181
311
-* rs/am-parse-options-cleanup (2022-12-13) 1 commit
312
- (merged to 'next' on 2022-12-16 at 9013ff2a19)
313
- + am: don't pass strvec to apply_parse_options()
182
+ source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
183
315
- Code clean-up.
316
- source: <baf93e4a-7f05-857c-e551-09675496c03c@web.de>
184
+--------------------------------------------------
185
+[Cooking]
186
187
+* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
188
+ - tests: don't lose misc "git" exit codes
189
+ - tests: don't lose "git" exit codes in "! ( git ... | grep )"
190
+ - tests: don't lose exit status with "test <op> $(git ...)"
191
+ - tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
192
+ - t/lib-patch-mode.sh: fix ignored exit codes
193
+ - auto-crlf tests: don't lose exit code in loops and outside tests
194
319
-* rs/clarify-error-in-write-loose-object (2022-12-14) 1 commit
320
- (merged to 'next' on 2022-12-16 at 8ef4588405)
321
- + object-file: inline write_buffer()
195
+ Test clean-up.
196
323
- Code clean-up.
324
- source: <94dff140-489c-40b2-7212-201ed3b7d008@web.de>
197
+ Expecting a hopefully minor and final reroll.
198
+ cf. <1182283a-4a78-3c99-e716-a8c3e58a5823@web.de>
199
+ cf. <xmqqsfhb0vum.fsf@gitster.g>
200
+ source: <cover-v4-0.6-00000000000-20221219T101240Z-avarab@gmail.com>
201
202
327
-* rs/clear-commit-marks-cleanup (2022-12-13) 1 commit
328
- (merged to 'next' on 2022-12-16 at a9e52a7cef)
329
- + commit: skip already cleared parents in clear_commit_marks_1()
203
+* cw/ci-whitespace (2022-12-20) 3 commits
204
+ - ci (check-whitespace): move to actions/checkout@v3
205
+ - ci (check-whitespace): add links to job output
206
+ - ci (check-whitespace): suggest fixes for errors
207
331
- Code clean-up.
332
- source: <7cf2ea1f-8dbf-5639-3874-86de391ae20a@web.de>
208
+ CI updates. We probably want a clean-up to move the long shell
209
+ script embedded in yaml file into a separate file, but that can
210
+ come later.
211
212
+ Will merge to 'next'.
213
+ source: <pull.1444.v2.git.1671496548.gitgitgadget@gmail.com>
214
335
-* rs/diff-parseopts (2022-12-02) 3 commits
336
- (merged to 'next' on 2022-12-16 at 6fdfd67cb9)
337
- + diff: remove parseopts member from struct diff_options
338
- + diff: use add_diff_options() in diff_opt_parse()
339
- + diff: factor out add_diff_options()
215
341
- The way the diff machinery prepares the options array for the
342
- parse_options API has been refactored to avoid resource leaks.
343
- source: <19325420-5630-87bb-0c2c-362151214b36@web.de>
216
+* dh/mingw-ownership-check-typofix (2022-12-20) 1 commit
217
+ (merged to 'next' on 2022-12-28 at 3753a46f6d)
218
+ + mingw: fix typo in an error message from ownership check
219
220
+ Error message typofix.
221
346
-* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
347
- (merged to 'next' on 2022-12-16 at 5cc6d4165a)
348
- + list-objects-filter: plug pattern_list leak
222
+ Will merge to 'master'.
223
+ source: <pull.1393.git.git.1671416810927.gitgitgadget@gmail.com>
224
350
- Leak fix.
351
- source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>
225
226
+* js/ci-disable-cmake-by-default (2022-12-20) 1 commit
227
+ (merged to 'next' on 2023-01-02 at 3f014ca5d1)
228
+ + ci: only run win+VS build & tests in Git for Windows' fork
229
354
-* rs/reflog-expiry-cleanup (2022-12-13) 1 commit
355
- (merged to 'next' on 2022-12-16 at 8165a625dd)
356
- + reflog: clear leftovers in reflog_expiry_cleanup()
230
+ Stop running win+VS build by default.
231
358
- Code clean-up.
359
- source: <a53d4df3-4b2c-585a-e8ad-2a9b9017fb8c@web.de>
232
+ Will merge to 'master'.
233
+ source: <pull.1445.git.1671461414191.gitgitgadget@gmail.com>
234
235
362
-* rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit
363
- (merged to 'next' on 2022-12-16 at 56ff27beaa)
364
- + t3920: support CR-eating grep
365
- (this branch uses js/t3920-shell-and-or-fix.)
236
+* sg/test-oid-wo-incomplete-line (2022-12-19) 1 commit
237
+ (merged to 'next' on 2022-12-28 at 8dadf8c521)
238
+ + tests: make 'test_oid' print trailing newline
239
367
- Test fix.
368
- source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>
240
+ Test helper updates.
241
242
+ Will merge to 'master'.
243
+ source: <20221218162905.3508164-1-szeder.dev@gmail.com>
244
371
-* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
372
- (merged to 'next' on 2022-12-16 at 71b4de7729)
373
- + t4205: don't exit test script on failure
245
375
- Test fix.
376
- source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>
246
+* ab/bundle-wo-args (2022-12-28) 3 commits
247
+ (merged to 'next' on 2022-12-28 at 6ae8fc1c88)
248
+ + bundle <cmd>: have usage_msg_opt() note the missing "<file>"
249
+ + builtin/bundle.c: remove superfluous "newargc" variable
250
+ (merged to 'next' on 2022-12-26 at b086677fd0)
251
+ + bundle: don't segfault on "git bundle <subcmd>"
252
253
+ Fix to a small regression in 2.38 days.
254
379
-* sg/help-autocorrect-config-fix (2022-12-13) 1 commit
380
- (merged to 'next' on 2022-12-16 at edcf99f34c)
381
- + help.c: fix autocorrect in work tree for bare repository
255
+ Will merge to 'master'.
256
+ source: <patch-1.1-2319eb2ddbd-20221220T133941Z-avarab@gmail.com>
257
+ source: <cover-0.2-00000000000-20221227T183708Z-avarab@gmail.com>
258
383
- The code to auto-correct a misspelt subcommand unnecessarily called
384
- into git_default_config() from the early config codepath, which was
385
- a no-no. This has bee corrected.
386
- source: <pull.1373.v2.git.git.1667073374852.gitgitgadget@gmail.com>
259
260
+* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
261
+ - test-lib: allow storing counts with test harnesses
262
389
-* sk/remove-duplicate-includes (2022-12-15) 1 commit
390
- (merged to 'next' on 2022-12-16 at 846bc84e59)
391
- + git: remove duplicate includes
263
+ Allow summary results from tests to be written to t/test-results
264
+ directory even when a test harness like 'prove' is in use.
265
393
- Code clean-up.
394
- source: <pull.1394.git.git.1671036743272.gitgitgadget@gmail.com>
266
+ Comments?
267
+ source: <20221224225200.1027806-1-adam@dinwoodie.org>
268
269
397
-* sx/pthread-error-check-fix (2022-12-05) 1 commit
398
- (merged to 'next' on 2022-12-16 at 60848153fe)
399
- + maintenance: compare output of pthread functions for inequality with 0
270
+* sk/win32-close-handle-upon-pthread-join (2022-12-26) 2 commits
271
+ - win32: close handles of threads that have been joined
272
+ - win32-pthread: prepare pthread.c for change by formatting
273
401
- Correct pthread API usage.
402
- source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>
274
+ source: <pull.1406.v12.git.git.1671932405.gitgitgadget@gmail.com>
275
404
---------------------------------------------------
405
-[Cooking]
276
277
* ab/no-more-git-global-super-prefix (2022-12-26) 9 commits
408
- - read-tree: add "--super-prefix" option, eliminate global
409
- - submodule--helper: convert "{update,clone}" to their own "--super-prefix"
410
- - submodule--helper: convert "status" to its own "--super-prefix"
411
- - submodule--helper: convert "sync" to its own "--super-prefix"
412
- - submodule--helper: convert "foreach" to its own "--super-prefix"
413
- - submodule--helper: don't use global --super-prefix in "absorbgitdirs"
414
- - submodule.c & submodule--helper: pass along "super_prefix" param
415
- - read-tree + fetch tests: test failing "--super-prefix" interaction
416
- - submodule absorbgitdirs tests: add missing "Migrating git..." tests
278
+ (merged to 'next' on 2022-12-28 at 126b1fbad1)
279
+ + read-tree: add "--super-prefix" option, eliminate global
280
+ + submodule--helper: convert "{update,clone}" to their own "--super-prefix"
281
+ + submodule--helper: convert "status" to its own "--super-prefix"
282
+ + submodule--helper: convert "sync" to its own "--super-prefix"
283
+ + submodule--helper: convert "foreach" to its own "--super-prefix"
284
+ + submodule--helper: don't use global --super-prefix in "absorbgitdirs"
285
+ + submodule.c & submodule--helper: pass along "super_prefix" param
286
+ + read-tree + fetch tests: test failing "--super-prefix" interaction
287
+ + submodule absorbgitdirs tests: add missing "Migrating git..." tests
288
289
Stop using "git --super-prefix" and narrow the scope of its use to
290
the submodule--helper.
291
421
- Will merge to 'next'.
292
+ Will merge to 'master'.
293
source: <cover-v5-0.9-00000000000-20221220T104519Z-avarab@gmail.com>
294
295
@@ -443,42 +314,6 @@ Release tarballs are available at:
314
source: <xmqqsfhgnmqg.fsf@gitster.g>
315
316
446
-* lk/line-range-parsing-fix (2022-12-20) 1 commit
447
- (merged to 'next' on 2022-12-26 at 216226a6e2)
448
- + line-range: fix infinite loop bug with '$' regex
449
-
450
- When given a pattern that matches an empty string at the end of a
451
- line, the code to parse the "git diff" line-ranges fell into an
452
- infinite loop, which has been corrected.
453
-
454
- Will merge to 'master'.
455
- source: <20221219224850.2703967-1-lars@oddbit.com>
456
-
457
-
458
-* sa/git-var-sequence-editor (2022-12-18) 1 commit
459
- (merged to 'next' on 2022-12-20 at a5737674b6)
460
- + var: add GIT_SEQUENCE_EDITOR variable
461
-
462
- Just like "git var GIT_EDITOR" abstracts the complex logic to
463
- choose which editor gets used behind it, "git var" now give support
464
- to GIT_SEQUENCE_EDITOR.
465
-
466
- Will merge to 'master'.
467
- source: <pull.1424.v2.git.1671318599482.gitgitgadget@gmail.com>
468
-
469
-
470
-* ss/pull-v-recurse-fix (2022-12-18) 1 commit
471
- (merged to 'next' on 2022-12-20 at 21f91dc75d)
472
- + submodule: accept -v for the update command
473
-
474
- "git pull -v --recurse-submodules" attempted to pass "-v" down to
475
- underlying "git submodule update", which did not understand the
476
- request and barfed, which has been corrected.
477
-
478
- Will merge to 'master'.
479
- source: <f805f2da-a7e1-9fde-cc0a-04a30f79c9af@cs-ware.de>
480
-
481
-
317
* ds/omit-trailing-hash-in-index (2022-12-17) 4 commits
318
- features: feature.manyFiles implies fast index writes
319
- test-lib-functions: add helper for trailing hash
@@ -515,17 +350,18 @@ Release tarballs are available at:
350
351
352
* jt/avoid-lazy-fetch-commits (2022-12-15) 4 commits
518
- - commit: don't lazy-fetch commits
519
- - object-file: emit corruption errors when detected
520
- - object-file: refactor map_loose_object_1()
521
- - object-file: remove OBJECT_INFO_IGNORE_LOOSE
353
+ (merged to 'next' on 2022-12-28 at 35276d17e2)
354
+ + commit: don't lazy-fetch commits
355
+ + object-file: emit corruption errors when detected
356
+ + object-file: refactor map_loose_object_1()
357
+ + object-file: remove OBJECT_INFO_IGNORE_LOOSE
358
523
- Even in a repository with promissor remote, it is useless to
359
+ Even in a repository with promisor remote, it is useless to
360
attempt to lazily attempt fetching an object that is expected to be
361
commit, because no "filter" mode omits commit objects. Take
362
advantage of this assumption to fail fast on errors.
363
528
- Will merge to 'next'?
364
+ Will merge to 'master'.
365
source: <cover.1671045259.git.jonathantanmy@google.com>
366
367
@@ -579,13 +415,14 @@ Release tarballs are available at:
415
416
417
* sa/cat-file-mailmap--batch-check (2022-12-20) 2 commits
582
- - cat-file: add mailmap support to --batch-check option
583
- - cat-file: add mailmap support to -s option
418
+ (merged to 'next' on 2022-12-28 at 57531d3fe8)
419
+ + cat-file: add mailmap support to --batch-check option
420
+ + cat-file: add mailmap support to -s option
421
422
'cat-file' gains mailmap support for its '--batch-check' and '-s'
423
options.
424
588
- Will merge to 'next'.
425
+ Will merge to 'master'.
426
cf. <221220.865ye6xlmo.gmgdl@evledraar.gmail.com>
427
source: <20221220060113.51010-1-siddharthasthana31@gmail.com>
428
@@ -625,24 +462,18 @@ Release tarballs are available at:
462
source: <20221130172833.2662751-1-thierry.reding@gmail.com>
463
464
628
-* ew/format-patch-mboxrd (2022-12-25) 1 commit
629
- (merged to 'next' on 2022-12-26 at bb6cc9e207)
630
- + format-patch: support format.mboxrd with --stdout
631
-
632
- "git format-patch" learned to honor format.mboxrd even when sending
633
- patches to the standard output stream,
634
-
635
- Will merge to 'master'.
636
- source: <20221222201619.M435985@dcvr>
637
-
638
-
465
* js/drop-mingw-test-cmp (2022-12-13) 1 commit
640
- - tests(mingw): avoid very slow `mingw_test_cmp`
466
+ (merged to 'next' on 2023-01-02 at 402866b048)
467
+ + tests(mingw): avoid very slow `mingw_test_cmp`
468
469
Use `git diff --no-index` as a test_cmp on Windows.
470
644
- Will merge to 'next'?
645
- source: <pull.1309.v5.git.1670339267.gitgitgadget@gmail.com>
471
+ We'd probably need to revisit "do we really want to, and have to,
472
+ lose CRLF vs LF?" later, at which time we may be able to further
473
+ clean this up by replacing "git diff --no-index" with "diff -u".
474
+
475
+ Will merge to 'master'.
476
+ source: <6a80fab7e3936ec56e1583d6136d47487327e907.1670339267.git.gitgitgadget@gmail.com>
477
478
479
* mc/switch-advice (2022-11-09) 1 commit
@@ -655,13 +486,17 @@ Release tarballs are available at:
486
487
488
* ja/worktree-orphan (2022-12-20) 4 commits
658
- - worktree add: add hint to use --orphan when bad ref
659
- - worktree add: add --orphan flag
660
- - worktree add: refactor opt exclusion tests
661
- - worktree add: include -B in usage docs
489
+ . worktree add: add hint to use --orphan when bad ref
490
+ . worktree add: add --orphan flag
491
+ . worktree add: refactor opt exclusion tests
492
+ . worktree add: include -B in usage docs
493
494
'git worktree add' learned how to create a worktree based on an
495
orphaned branch with `--orphan`.
496
+
497
+ Seems to break the CI.
498
+ cf. https://github.com/git/git/actions/runs/3784676950 (bad with topic)
499
+ https://github.com/git/git/actions/runs/3787726481 (good without)
500
source: <20221220023637.29042-1-jacobabel@nullpo.dev>
501
502
@@ -689,26 +524,6 @@ Release tarballs are available at:
524
source: <cover.1667980450.git.dyroneteng@gmail.com>
525
526
692
-* ds/bundle-uri-4 (2022-12-25) 11 commits
693
- (merged to 'next' on 2022-12-26 at 6d7c21c44a)
694
- + clone: unbundle the advertised bundles
695
- + bundle-uri: download bundles from an advertised list
696
- + bundle-uri: allow relative URLs in bundle lists
697
- + strbuf: introduce strbuf_strip_file_from_path()
698
- + bundle-uri: serve bundle.* keys from config
699
- + bundle-uri client: add helper for testing server
700
- + transport: rename got_remote_heads
701
- + bundle-uri client: add boolean transfer.bundleURI setting
702
- + clone: request the 'bundle-uri' command when available
703
- + t: create test harness for 'bundle-uri' command
704
- + protocol v2: add server-side "bundle-uri" skeleton
705
-
706
- Bundle URIs part 4.
707
-
708
- Will merge to 'master'.
709
- source: <pull.1400.v4.git.1671722058.gitgitgadget@gmail.com>
710
-
711
-
527
* po/pretty-hard-trunc (2022-11-13) 1 commit
528
- pretty-formats: add hard truncation, without ellipsis, options
529
@@ -724,7 +539,7 @@ Release tarballs are available at:
539
- pack-objects: allow --filter without --stdout
540
541
"git repack" learns to discard objects that ought to be retrievable
727
- again from the promissor remote.
542
+ again from the promisor remote.
543
source: <20221221040446.2860985-1-christian.couder@gmail.com>
544
545
@@ -743,52 +558,3 @@ Release tarballs are available at:
558
Waiting for review responses (or a reroll).
559
cf. <1dc44716-2550-47de-e666-9972b102905d@github.com>
560
source: <pull.1352.v4.git.1670880984.gitgitgadget@gmail.com>
746
-
747
---------------------------------------------------
748
-[Discarded]
749
-
750
-* pw/test-todo (2022-10-06) 3 commits
751
- . test_todo: allow [verbose] test as the command
752
- . test_todo: allow [!] grep as the command
753
- . tests: add test_todo() to mark known breakages
754
-
755
- RFC for test framework improvement.
756
-
757
- Needs review.
758
- source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
759
-
760
-
761
-* cw/submodule-status-in-parallel (2022-11-08) 6 commits
762
- . diff-lib: parallelize run_diff_files for submodules
763
- . diff-lib: refactor match_stat_with_submodule
764
- . submodule: move status parsing into function
765
- . submodule: strbuf variable rename
766
- . run-command: add duplicate_output_fn to run_processes_parallel_opts
767
- . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
768
-
769
- Allow the internal "diff-files" engine to run "how has this
770
- submodule changed?" in parallel to speed up "git status".
771
-
772
- Waiting for review.
773
- source: <20221020232532.1128326-1-calvinwan@google.com>
774
-
775
-
776
-* es/doc-creation-factor-fix (2022-07-28) 2 commits
777
- . range-diff: clarify --creation-factor=<factor>
778
- . format-patch: clarify --creation-factor=<factor>
779
-
780
- Expecting a reroll by somebody more familiar with the logic
781
- cf. <xmqqo7wfix7p.fsf@gitster.g>
782
- source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
783
-
784
-
785
-* ds/bundle-uri-4-fixup (2022-12-13) 3 commits
786
- . bundle-uri: remove GIT_TEST_BUNDLE_URI env variable
787
- . bundle-uri: advertise based on repo config
788
- . bundle-uri: drop unused 'uri' parameter
789
-
790
- Incremental fixes on ds/bundle-uri-4 topic.
791
-
792
- Discarded.
793
- The base topic has been updated to make these "oops" fixes unneeded.
794
- source: <pull.1443.git.1670866407.gitgitgadget@gmail.com>