What's cooking (2022/06 #04)
Junio C Hamano committed
Jun 13, 2022 at 16:16 UTC
c90c6ce5940334c2666eea39829606e03e243a8e
1 file changed
+200
-337
whats-cooking.txt
+200
-337
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2022, #03; Fri, 10)
4
-X-master-at: 5699ec1b0aec51b9e9ba5a2785f65970c5a95d84
5
-X-next-at: 398c3b25f6b9f91c426747cd7d43f16731766a3a
3
+Subject: What's cooking in git.git (Jun 2022, #04; Mon, 13)
4
+X-master-at: 8168d5e9c23ed44ae3d604f392320d66556453c9
5
+X-next-at: 0611611a94d360ce329fe0f1863f779d7fab5cab
6
7
-What's cooking in git.git (Jun 2022, #03; Fri, 10)
7
+What's cooking in git.git (Jun 2022, #04; Mon, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,9 +13,15 @@ topic is stable enough to be used and are candidate to be in a
13
future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
-This cycle will complete at around the end of June
17
-(https://tinyurl.com/gitCal); -rc0 and -rc1 are scheduled to happen
18
-next week.
16
+I just tagged Git 2.37-rc0, after merging some topics to the
17
+'master' branch. For some topics, it is a day early (I usually try
18
+to have topics cook at least 7 calendar days in 'next'), but since
19
+tomorrow is my "offline every other Tuesday" day, I am merging them
20
+early, among them is a fix for another (and hopefully the last
21
+known) 2.36 regression. I plan to tag -rc1 around the end of the
22
+week, at which time we will stop merging any new topic from the
23
+'next' branch down to 'master' until the final release that will
24
+happen around the end of the month (https://tinyurl.com/gitCal).
25
26
Copies of the source code to Git live in many repositories, and the
27
following is a list of the ones I push into or their mirrors. Some
@@ -48,180 +54,152 @@ Release tarballs are available at:
54
--------------------------------------------------
55
[Graduated to 'master']
56
51
-* ab/bug-if-bug (2022-06-02) 6 commits
52
- (merged to 'next' on 2022-06-03 at 25290bb7ec)
53
- + cache-tree.c: use bug() and BUG_if_bug()
54
- + receive-pack: use bug() and BUG_if_bug()
55
- + parse-options.c: use optbug() instead of BUG() "opts" check
56
- + parse-options.c: use new bug() API for optbug()
57
- + usage.c: add a non-fatal bug() function to go with BUG()
58
- + common-main.c: move non-trace2 exit() behavior out of trace2.c
59
-
60
- A new bug() and BUG_if_bug() API is introduced to make it easier to
61
- uniformly log "detect multiple bugs and abort in the end" pattern.
62
- source: <cover-v3-0.6-00000000000-20220602T122106Z-avarab@gmail.com>
63
-
64
-
65
-* ab/env-array (2022-06-02) 2 commits
66
- (merged to 'next' on 2022-06-02 at e1e05318d3)
67
- + run-command API users: use "env" not "env_array" in comments & names
68
- + run-command API: rename "env_array" to "env"
69
-
70
- Rename .env_array member to .env in the child_process structure.
71
- source: <cover-v3-0.2-00000000000-20220602T090745Z-avarab@gmail.com>
72
-
73
-
74
-* cb/buggy-gcc-12-workaround (2022-06-01) 1 commit
75
- (merged to 'next' on 2022-06-01 at 01e199fd58)
76
- + Revert -Wno-error=dangling-pointer
77
-
78
- With a more targetted workaround in http.c in another topic, we may
79
- be able to lift this blanket "GCC12 dangling-pointer warning is
80
- broken and unsalvageable" workaround.
81
-
82
-
83
-* gc/zero-length-branch-config-fix (2022-06-01) 2 commits
84
- (merged to 'next' on 2022-06-02 at 438605f627)
85
- + remote.c: reject 0-length branch names
86
- + remote.c: don't BUG() on 0-length branch names
87
-
88
- A misconfigured 'branch..remote' led to a bug in configuration
89
- parsing.
90
- source: <pull.1273.git.git.1654038754.gitgitgadget@gmail.com>
91
-
92
-
93
-* jh/builtin-fsmonitor-part3 (2022-05-26) 31 commits
94
- (merged to 'next' on 2022-06-02 at 3599e359b3)
95
- + t7527: improve implicit shutdown testing in fsmonitor--daemon
96
- + fsmonitor--daemon: allow --super-prefix argument
97
- + t7527: test Unicode NFC/NFD handling on MacOS
98
- + t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
99
- + t/helper/hexdump: add helper to print hexdump of stdin
100
- + fsmonitor: on macOS also emit NFC spelling for NFD pathname
101
- + t7527: test FSMonitor on case insensitive+preserving file system
102
- + fsmonitor: never set CE_FSMONITOR_VALID on submodules
103
- + t/perf/p7527: add perf test for builtin FSMonitor
104
- + t7527: FSMonitor tests for directory moves
105
- + fsmonitor: optimize processing of directory events
106
- + fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
107
- + fsm-health-win32: force shutdown daemon if worktree root moves
108
- + fsm-health-win32: add polling framework to monitor daemon health
109
- + fsmonitor--daemon: stub in health thread
110
- + fsmonitor--daemon: rename listener thread related variables
111
- + fsmonitor--daemon: prepare for adding health thread
112
- + fsmonitor--daemon: cd out of worktree root
113
- + fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
114
- + unpack-trees: initialize fsmonitor_has_run_once in o->result
115
- + fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
116
- + fsmonitor-settings: remote repos on Windows are incompatible
117
- + fsmonitor-settings: remote repos on macOS are incompatible
118
- + fsmonitor-settings: stub in macOS-specific incompatibility checking
119
- + fsmonitor-settings: VFS for Git virtual repos are incompatible
120
- + fsmonitor-settings: stub in Win32-specific incompatibility checking
121
- + fsmonitor-settings: bare repos are incompatible with FSMonitor
122
- + t/helper/fsmonitor-client: create stress test
123
- + t7527: test FSMonitor on repos with Unicode root paths
124
- + fsm-listen-win32: handle shortnames
125
- + Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
126
-
127
- More fsmonitor--daemon.
128
- source: <pull.1143.v9.git.1653601644.gitgitgadget@gmail.com>
129
-
130
-
131
-* jy/gitweb-xhtml5 (2022-06-02) 1 commit
132
- (merged to 'next' on 2022-06-02 at cc6a77b48b)
133
- + gitweb: switch to an XHTML5 DOCTYPE
134
-
135
- Update the doctype written in gitweb output to xhtml5.
136
- source: <20220602114305.5915-1-jason@jasonyundt.email>
57
+* ab/hooks-regression-fix (2022-06-07) 2 commits
58
+ (merged to 'next' on 2022-06-08 at c1109feb67)
59
+ + hook API: fix v2.36.0 regression: hooks should be connected to a TTY
60
+ + run-command: add an "ungroup" option to run_process_parallel()
61
+
62
+ In Git 2.36 we revamped the way how hooks are invoked. One change
63
+ that is end-user visible is that the output of a hook is no longer
64
+ directly connected to the standard output of "git" that spawns the
65
+ hook, which was noticed post release. This is getting corrected.
66
+ source: <cover-v6-0.2-00000000000-20220606T170356Z-avarab@gmail.com>
67
+
68
+
69
+* ab/remote-free-fix (2022-06-07) 2 commits
70
+ (merged to 'next' on 2022-06-08 at 03c3aeaeee)
71
+ + remote.c: don't dereference NULL in freeing loop
72
+ + remote.c: remove braces from one-statement "for"-loops
73
+
74
+ Use-after-free (with another forget-to-free) fix.
75
+ source: <cover-0.3-00000000000-20220607T154520Z-avarab@gmail.com>
76
+
77
+
78
+* ds/credentials-in-url (2022-06-06) 1 commit
79
+ (merged to 'next' on 2022-06-08 at 3db83a2012)
80
+ + remote: create fetch.credentialsInUrl config
81
+
82
+ The "fetch.credentialsInUrl" configuration variable controls what
83
+ happens when a URL with embedded login credential is used.
84
+ source: <pull.1237.v5.git.1654526176695.gitgitgadget@gmail.com>
85
138
---------------------------------------------------
139
-[New Topics]
86
87
* gc/document-config-worktree-scope (2022-06-07) 1 commit
88
(merged to 'next' on 2022-06-08 at 85f62a864a)
89
+ config: document and test the 'worktree' scope
90
91
Doc update.
146
-
147
- Will merge to 'master'.
92
source: <pull.1274.git.git.1654637044966.gitgitgadget@gmail.com>
93
94
151
-* ds/branch-checked-out (2022-06-08) 4 commits
152
- - branch: use branch_checked_out() when deleting refs
153
- - fetch: use new branch_checked_out() and add tests
154
- - branch: check for bisects and rebases
155
- - branch: add branch_checked_out() helper
95
+* js/wait-or-whine-can-fail (2022-06-07) 1 commit
96
+ (merged to 'next' on 2022-06-08 at 54fe70c95d)
97
+ + run-command: don't spam trace2_child_exit()
98
157
- Introduce a helper to see if a branch is already being worked on
158
- (hence should not be newly checked out in a working tree), which
159
- performs much better than the existing find_shared_symref() to
160
- replace many uses of the latter.
99
+ We used to log an error return from wait_or_whine() as process
100
+ termination of the waited child, which was incorrect.
101
+ source: <50d872a057a558fa5519856b95abd048ddb514dc.1654625626.git.steadmon@google.com>
102
162
- Will merge to 'next'?
163
- source: <pull.1254.git.1654718942.gitgitgadget@gmail.com>
103
104
+* jt/unparse-commit-upon-graft-change (2022-06-06) 1 commit
105
+ (merged to 'next' on 2022-06-08 at 3d8de84325)
106
+ + commit,shallow: unparse commits if grafts changed
107
166
-* fs/ssh-default-key-command-doc (2022-06-08) 1 commit
167
- (merged to 'next' on 2022-06-10 at b5cc5b6619)
168
- + gpg docs: explain better use of ssh.defaultKeyCommand
108
+ Updating the graft information invalidates the list of parents of
109
+ in-core commit objects that used to be in the graft file.
110
+ source: <20220606175437.1740447-1-jonathantanmy@google.com>
111
170
- Doc update.
112
172
- Will merge to 'master'.
173
- source: <20220608152437.126276-1-fs@gigacodes.de>
113
+* pb/range-diff-with-submodule (2022-06-06) 1 commit
114
+ (merged to 'next' on 2022-06-07 at e5e31590c4)
115
+ + range-diff: show submodule changes irrespective of diff.submodule
116
117
+ "git -c diff.submodule=log range-diff" did not show anything for
118
+ submodules that changed in the ranges being compared, and
119
+ "git -c diff.submodule=diff range-diff" did not work correctly.
120
+ Fix this by including the "--submodule=short" output
121
+ unconditionally to be compared.
122
+ source: <pull.1244.v2.git.1654549153769.gitgitgadget@gmail.com>
123
176
-* js/ci-github-workflow-markup (2022-06-10) 3 commits
177
- - ci(github): also mark up compile errors
178
- - ci(github): use grouping also in the `win-build` job
179
- - ci(github): bring back the 'print test failures' step
124
181
- Recent CI update hides certain failures in test jobs, which has
125
+* sn/fsmonitor-missing-clock (2022-06-07) 1 commit
126
+ (merged to 'next' on 2022-06-08 at 812b99338c)
127
+ + fsmonitor: query watchman with right valid json
128
+
129
+ Sample watchman interface hook sometimes failed to produce
130
+ correctly formatted JSON message, which has been corrected.
131
+ source: <20220607111419.15753-1-sluongng@gmail.com>
132
+
133
+
134
+* tb/show-ref-optim (2022-06-06) 1 commit
135
+ (merged to 'next' on 2022-06-08 at 683a3cc261)
136
+ + builtin/show-ref.c: avoid over-iterating with --heads, --tags
137
+
138
+ "git show-ref --heads" (and "--tags") still iterated over all the
139
+ refs only to discard refs outside the specified area, which has
140
been corrected.
141
+ source: <3fa6932641f18d78156bbf60b1571383f2cb5046.1654293264.git.me@ttaylorr.com>
142
184
- Will merge to 'next'?
185
- source: <pull.1253.git.1654774347.gitgitgadget@gmail.com>
143
144
+* tl/ls-tree-oid-only (2022-06-03) 1 commit
145
+ (merged to 'next' on 2022-06-07 at e1c1e0b25a)
146
+ + ls-tree: test for the regression in 9c4d58ff2c3
147
188
-* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
189
- - fetch,fetch-pack: clarify connectivity check error
148
+ Add tests for a regression fixed earlier.
149
+ source: <patch-v2-1.1-f2beb02dd29-20220603T102148Z-avarab@gmail.com>
150
191
- We may find an object missing after a "git fetch" stores the
192
- objects it obtained from the other side, but it is not necessarily
193
- because the remote failed to send necessary objects. Reword the
194
- messages in an attempt to help users explore other possibilities
195
- when they hit this error.
151
197
- Expecting a reroll.
198
- source: <20220610195247.1177549-1-jonathantanmy@google.com>
152
+* zh/read-cache-copy-name-entry-fix (2022-06-06) 1 commit
153
+ (merged to 'next' on 2022-06-08 at 760f43dd19)
154
+ + read-cache.c: reduce unnecessary cache entry name copying
155
156
+ Remove redundant copying (with index v3 and older) or possible
157
+ over-reading beyond end of mmapped memory (with index v4) has been
158
+ corrected.
159
+ source: <pull.1249.git.1654436248249.gitgitgadget@gmail.com>
160
201
-* gc/submodule-update (2022-06-10) 8 commits
202
- - submodule update: remove never-used expansion
203
- - submodule update: stop parsing options in .sh
204
- - submodule update: remove -v, pass --quiet
205
- - submodule--helper update: use one param per type
206
- - submodule update: pass --require-init and --init
207
- - submodule update: pass options with stuck forms
208
- - submodule update: pass options containing "[no-]"
209
- - submodule update: remove intermediate parsing
161
+--------------------------------------------------
162
+[New Topics]
163
211
- More work on "git submodule update".
164
+* jc/apply-icase-tests (2022-06-13) 1 commit
165
+ - t4141: test "git apply" with core.ignorecase
166
213
- Needs review.
214
- source: <pull.1275.git.git.1654820781.gitgitgadget@gmail.com>
167
+ source: <xmqqo7yw77qo.fsf@gitster.g>
168
169
217
-* jc/resolve-undo (2022-06-09) 1 commit
218
- - revision: mark blobs needed for resolve-undo as reachable
170
+* ll/curl-accept-language (2022-06-13) 2 commits
171
+ - PREP??? give initializer to rpc_state
172
+ - remote-curl: send Accept-Language header to server
173
220
- The resolve-undo information in the index was not protected against
221
- GC, which has been corrected.
174
+ source: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com>
175
223
- Will merge to 'next'?
224
- source: <xmqqfskdieqz.fsf@gitster.g>
176
+
177
+* pb/diff-doc-raw-format (2022-06-13) 3 commits
178
+ - diff-index.txt: update raw output format in examples
179
+ - diff-format.txt: correct misleading wording
180
+ - diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
181
+
182
+ source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>
183
+
184
+
185
+* rs/archive-with-internal-gzip (2022-06-13) 5 commits
186
+ - archive-tar: use internal gzip by default
187
+ - archive-tar: use OS_CODE 3 (Unix) for internal gzip
188
+ - archive-tar: add internal gzip implementation
189
+ - archive-tar: factor out write_block()
190
+ - archive: rename archiver data field to filter_command
191
+
192
+ source: <217a2f4d-4fc2-aaed-f5c2-1b7e134b046d@web.de>
193
+
194
+
195
+* tl/pack-bitmap-trace (2022-06-13) 5 commits
196
+ - bitmap: add trace2 outputs during open "bitmap" file
197
+ - pack-bitmap.c: using error() instead of silently returning -1
198
+ - pack-bitmap.c: make warnings support i18N when opening bitmap
199
+ - pack-bitmap.c: rename "idx_name" to "bitmap_name"
200
+ - pack-bitmap.c: continue looping when first MIDX bitmap is found
201
+
202
+ source: <cover.1655018322.git.dyroneteng@gmail.com>
203
204
--------------------------------------------------
205
[Stalled]
@@ -286,16 +264,81 @@ Release tarballs are available at:
264
--------------------------------------------------
265
[Cooking]
266
289
-* pb/range-diff-with-submodule (2022-06-06) 1 commit
290
- (merged to 'next' on 2022-06-07 at e5e31590c4)
291
- + range-diff: show submodule changes irrespective of diff.submodule
267
+* ds/branch-checked-out (2022-06-13) 5 commits
268
+ - branch: fix branch_checked_out() leaks
269
+ - branch: use branch_checked_out() when deleting refs
270
+ - fetch: use new branch_checked_out() and add tests
271
+ - branch: check for bisects and rebases
272
+ - branch: add branch_checked_out() helper
273
+
274
+ Introduce a helper to see if a branch is already being worked on
275
+ (hence should not be newly checked out in a working tree), which
276
+ performs much better than the existing find_shared_symref() to
277
+ replace many uses of the latter.
278
293
- "git range-diff" did not show anything for submodules that changed
294
- in the ranges being compared. Change the behaviour to include the
295
- "--submodule=short" output unconditionally to be compared.
279
+ Will merge to 'next'?
280
+ source: <pull.1254.git.1654718942.gitgitgadget@gmail.com>
281
+
282
+
283
+* fs/ssh-default-key-command-doc (2022-06-08) 1 commit
284
+ (merged to 'next' on 2022-06-10 at b5cc5b6619)
285
+ + gpg docs: explain better use of ssh.defaultKeyCommand
286
+
287
+ Doc update.
288
289
Will merge to 'master'.
298
- source: <pull.1244.v2.git.1654549153769.gitgitgadget@gmail.com>
290
+ source: <20220608152437.126276-1-fs@gigacodes.de>
291
+
292
+
293
+* js/ci-github-workflow-markup (2022-06-13) 3 commits
294
+ - ci(github): also mark up compile errors
295
+ - ci(github): use grouping also in the `win-build` job
296
+ - ci(github): bring back the 'print test failures' step
297
+
298
+ Recent CI update hides certain failures in test jobs, which has
299
+ been corrected.
300
+
301
+ Will merge to 'next'.
302
+ source: <pull.1253.v2.git.1655125988.gitgitgadget@gmail.com>
303
+
304
+
305
+* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
306
+ - fetch,fetch-pack: clarify connectivity check error
307
+
308
+ We may find an object missing after a "git fetch" stores the
309
+ objects it obtained from the other side, but it is not necessarily
310
+ because the remote failed to send necessary objects. Reword the
311
+ messages in an attempt to help users explore other possibilities
312
+ when they hit this error.
313
+
314
+ Expecting a reroll.
315
+ source: <20220610195247.1177549-1-jonathantanmy@google.com>
316
+
317
+
318
+* gc/submodule-update (2022-06-10) 8 commits
319
+ - submodule update: remove never-used expansion
320
+ - submodule update: stop parsing options in .sh
321
+ - submodule update: remove -v, pass --quiet
322
+ - submodule--helper update: use one param per type
323
+ - submodule update: pass --require-init and --init
324
+ - submodule update: pass options with stuck forms
325
+ - submodule update: pass options containing "[no-]"
326
+ - submodule update: remove intermediate parsing
327
+
328
+ More work on "git submodule update".
329
+
330
+ Needs review.
331
+ source: <pull.1275.git.git.1654820781.gitgitgadget@gmail.com>
332
+
333
+
334
+* jc/resolve-undo (2022-06-09) 1 commit
335
+ - revision: mark blobs needed for resolve-undo as reachable
336
+
337
+ The resolve-undo information in the index was not protected against
338
+ GC, which has been corrected.
339
+
340
+ Will merge to 'next'?
341
+ source: <xmqqfskdieqz.fsf@gitster.g>
342
343
344
* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits
@@ -310,17 +353,6 @@ Release tarballs are available at:
353
source: <20220606175022.8410-1-joak-pet@online.no>
354
355
313
-* jt/unparse-commit-upon-graft-change (2022-06-06) 1 commit
314
- (merged to 'next' on 2022-06-08 at 3d8de84325)
315
- + commit,shallow: unparse commits if grafts changed
316
-
317
- Updating the graft information invalidates the list of parents of
318
- in-core commit objects that used to be in the graft file.
319
-
320
- Will merge to 'master'.
321
- source: <20220606175437.1740447-1-jonathantanmy@google.com>
322
-
323
-
356
* ab/build-gitweb (2022-06-02) 7 commits
357
- Makefile: build 'gitweb' in the default target
358
- gitweb/Makefile: include in top-level Makefile
@@ -364,13 +396,12 @@ Release tarballs are available at:
396
source: <pull.1246.v3.git.1654858481.gitgitgadget@gmail.com>
397
398
367
-* hx/unpack-streaming (2022-06-10) 7 commits
399
+* hx/unpack-streaming (2022-06-13) 6 commits
400
- unpack-objects: use stream_loose_object() to unpack large objects
401
- core doc: modernize core.bigFileThreshold documentation
402
- object-file.c: add "stream_loose_object()" to handle large object
403
- object-file.c: factor out deflate part of write_loose_object()
404
- object-file.c: refactor write_loose_object() to several steps
373
- - object-file.c: do fsync() and close() before post-write die()
405
- unpack-objects: low memory footprint for get_data() in dry_run mode
406
407
Allow large objects read from a packstream to be streamed into a
@@ -378,7 +409,7 @@ Release tarballs are available at:
409
whole.
410
411
Will merge to 'next'?
381
- source: <cover.1654871915.git.chiyutianyi@gmail.com>
412
+ source: <cover.1654914555.git.chiyutianyi@gmail.com>
413
414
415
* po/rebase-preserve-merges (2022-06-06) 4 commits
@@ -397,51 +428,6 @@ Release tarballs are available at:
428
source: <pull.1242.v2.git.1654341469.gitgitgadget@gmail.com>
429
430
400
-* tb/show-ref-optim (2022-06-06) 1 commit
401
- (merged to 'next' on 2022-06-08 at 683a3cc261)
402
- + builtin/show-ref.c: avoid over-iterating with --heads, --tags
403
-
404
- "git show-ref --heads" (and "--tags") still iterated over all the
405
- refs, which has been corrected.
406
-
407
- Will merge to 'master'.
408
- source: <3fa6932641f18d78156bbf60b1571383f2cb5046.1654293264.git.me@ttaylorr.com>
409
-
410
-
411
-* zh/read-cache-copy-name-entry-fix (2022-06-06) 1 commit
412
- (merged to 'next' on 2022-06-08 at 760f43dd19)
413
- + read-cache.c: reduce unnecessary cache entry name copying
414
-
415
- Remove redundant copying (with index v3 and older) or possible
416
- over-reading beyond end of mmapped memory (with index v4) has been
417
- corrected.
418
-
419
- Will merge to 'master'.
420
- source: <pull.1249.git.1654436248249.gitgitgadget@gmail.com>
421
-
422
-
423
-* ab/remote-free-fix (2022-06-07) 2 commits
424
- (merged to 'next' on 2022-06-08 at 03c3aeaeee)
425
- + remote.c: don't dereference NULL in freeing loop
426
- + remote.c: remove braces from one-statement "for"-loops
427
-
428
- Use-after-free (with another forget-to-free) fix.
429
-
430
- Will merge to 'master'.
431
- source: <cover-0.3-00000000000-20220607T154520Z-avarab@gmail.com>
432
-
433
-
434
-* sn/fsmonitor-missing-clock (2022-06-07) 1 commit
435
- (merged to 'next' on 2022-06-08 at 812b99338c)
436
- + fsmonitor: query watchman with right valid json
437
-
438
- Sample watchman interface hook sometimes failed to produce
439
- correctly formatted JSON message, which has been corrected.
440
-
441
- Will merge to 'master'.
442
- source: <20220607111419.15753-1-sluongng@gmail.com>
443
-
444
-
431
* tb/show-ref-count (2022-06-06) 2 commits
432
- builtin/show-ref.c: limit output with `--count`
433
- builtin/show-ref.c: rename `found_match` to `matches_nr`
@@ -463,38 +449,6 @@ Release tarballs are available at:
449
source: <xmqq7d5suoqt.fsf@gitster.g>
450
451
466
-* js/wait-or-whine-can-fail (2022-06-07) 1 commit
467
- (merged to 'next' on 2022-06-08 at 54fe70c95d)
468
- + run-command: don't spam trace2_child_exit()
469
-
470
- We used to log an error return from wait_or_whine() as process
471
- termination of the waited child, which was incorrect.
472
-
473
- Will merge to 'master'.
474
- source: <50d872a057a558fa5519856b95abd048ddb514dc.1654625626.git.steadmon@google.com>
475
-
476
-
477
-* ds/credentials-in-url (2022-06-06) 1 commit
478
- (merged to 'next' on 2022-06-08 at 3db83a2012)
479
- + remote: create fetch.credentialsInUrl config
480
-
481
- The "fetch.credentialsInUrl" configuration variable controls what
482
- happens when a URL with embedded login credential is used.
483
-
484
- Will merge to 'master'.
485
- source: <pull.1237.v5.git.1654526176695.gitgitgadget@gmail.com>
486
-
487
-
488
-* tl/ls-tree-oid-only (2022-06-03) 1 commit
489
- (merged to 'next' on 2022-06-07 at e1c1e0b25a)
490
- + ls-tree: test for the regression in 9c4d58ff2c3
491
-
492
- Add tests for a regression fixed earlier.
493
-
494
- Will merge to 'master'.
495
- source: <patch-v2-1.1-f2beb02dd29-20220603T102148Z-avarab@gmail.com>
496
-
497
-
452
* ds/bundle-uri-more (2022-06-06) 6 commits
453
- fetch: add 'refs/bundle/' to log.excludeDecoration
454
- bundle-uri: add support for http(s):// and file://
@@ -560,20 +514,6 @@ Release tarballs are available at:
514
source: <20220513010020.55361-5-carenas@gmail.com>
515
516
563
-* ab/hooks-regression-fix (2022-06-07) 2 commits
564
- (merged to 'next' on 2022-06-08 at c1109feb67)
565
- + hook API: fix v2.36.0 regression: hooks should be connected to a TTY
566
- + run-command: add an "ungroup" option to run_process_parallel()
567
-
568
- In Git 2.36 we revamped the way how hooks are invoked. One change
569
- that is end-user visible is that the output of a hook is no longer
570
- directly connected to the standard output of "git" that spawns the
571
- hook, which was noticed post release. This is getting corrected.
572
-
573
- Will merge to 'master'.
574
- source: <cover-v6-0.2-00000000000-20220606T170356Z-avarab@gmail.com>
575
-
576
-
517
* gc/bare-repo-discovery (2022-06-07) 5 commits
518
- setup.c: create `discovery.bare`
519
- safe.directory: use git_protected_config()
@@ -615,80 +555,3 @@ Release tarballs are available at:
555
556
Thoughts?
557
source: <20220422083629.1404989-1-hi@alyssa.is>
618
-
619
---------------------------------------------------
620
-[Discarded]
621
-
622
-* ds/rebase-update-refs (2022-06-07) 7 commits
623
- . rebase: add rebase.updateRefs config option
624
- . sequencer: implement 'update-refs' command
625
- . rebase: add --update-refs option
626
- . sequencer: add update-refs command
627
- . sequencer: define array with enum values
628
- . branch: add branch_checked_out() helper
629
- . log-tree: create for_each_decoration()
630
-
631
- "git rebase" learns "--update-refs" to update the refs that point
632
- at commits being rewritten so that they point at the corresponding
633
- commits in the rewritten history.
634
-
635
- Retracted for possible future redesign.
636
- cf. <pull.1254.git.1654718942.gitgitgadget@gmail.com>
637
- source: <pull.1247.v2.git.1654634569.gitgitgadget@gmail.com>
638
-
639
-
640
-* ab/ci-github-workflow-markup (2022-05-26) 14 commits
641
- . CI: make the --github-workflow-markup "github" output the default
642
- . CI: make --github-workflow-markup ci-config, off by default
643
- . ci: call `finalize_test_case_output` a little later
644
- . ci(github): mention where the full logs can be found
645
- . ci(github): avoid printing test case preamble twice
646
- . ci(github): skip "skip" tests in --github-workflow-markup
647
- . ci(github): skip the logs of the successful test cases
648
- . ci: make it easier to find failed tests' logs in the GitHub workflow
649
- . ci: optionally mark up output in the GitHub workflow
650
- . test(junit): avoid line feeds in XML attributes
651
- . tests: refactor --write-junit-xml code
652
- . CI: stop setting FAILED_TEST_ARTIFACTS N times
653
- . CI: don't include "test-results/" in ci/print-test-failures.sh output
654
- . CI: don't "cd" in ci/print-test-failures.sh
655
- (this branch uses ab/ci-setup-simplify.)
656
-
657
- Discarded to stop "competing" with js/ci-github-workflow-markup.
658
-
659
-
660
-* ab/ci-setup-simplify (2022-05-26) 29 commits
661
- . CI: make it easy to use ci/*.sh outside of CI
662
- . CI: don't use "set -x" in "ci/lib.sh" output
663
- . CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
664
- . CI: set SANITIZE=leak in MAKEFLAGS directly
665
- . CI: set CC in MAKEFLAGS directly, don't add it to the environment
666
- . CI: add more variables to MAKEFLAGS, except under vs-build
667
- . CI: narrow down variable definitions in --build and --test
668
- . CI: only invoke ci/lib.sh as "steps" in main.yml
669
- . CI: pre-select test slice in Windows & VS tests
670
- . ci/run-test-slice.sh: replace shelling out with "echo"
671
- . CI: move "env" definitions into ci/lib.sh
672
- . CI: combine ci/install{,-docker}-dependencies.sh
673
- . CI: split up and reduce "ci/test-documentation.sh"
674
- . CI: invoke "make artifacts-tar" directly in windows-build
675
- . CI: check ignored unignored build artifacts in "win[+VS] build" too
676
- . CI: make ci/{lib,install-dependencies}.sh POSIX-compatible
677
- . CI: remove "run-build-and-tests.sh", run "make [test]" directly
678
- . CI: export variables via a wrapper
679
- . CI: consistently use "export" in ci/lib.sh
680
- . CI: move p4 and git-lfs variables to ci/install-dependencies.sh
681
- . CI: have "static-analysis" run "check-builtins", not "documentation"
682
- . CI: have "static-analysis" run a "make ci-static-analysis" target
683
- . CI: don't have "git grep" invoke a pager in tree content check
684
- . CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS
685
- . CI: remove unused Azure ci/* code
686
- . CI: remove dead "tree skipping" code
687
- . CI: remove more dead Travis CI support
688
- . CI: make "$jobname" explicit, remove fallback
689
- . CI: run "set -ex" early in ci/lib.sh
690
- (this branch is used by ab/ci-github-workflow-markup.)
691
-
692
- Discarded to stop "conflicing" with js/ci-github-workflow-markup;
693
- good bits from the series may want to be resurrected and rebuilt on
694
- top of the other topics.