What's cooking (2022/05 #04)
Junio C Hamano committed
May 12, 2022 at 16:13 UTC
e630d22cf8b934d5608bc80d3897751204ae0a9a
1 file changed
+380
-345
whats-cooking.txt
+380
-345
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2022, #03; Tue, 10)
4
-X-master-at: e8005e4871f130c4e402ddca2032c111252f070a
5
-X-next-at: 7c58a9bb42e7a3326f92385eb92bb0e04adc04ba
3
+Subject: What's cooking in git.git (May 2022, #04; Thu, 12)
4
+X-master-at: 277cf0bc36094f6dc4297d8c9cef79df045b735d
5
+X-next-at: 0e6072fb45b2316f096b16b5a8b4fee15a93929e
6
7
-What's cooking in git.git (May 2022, #03; Tue, 10)
7
+What's cooking in git.git (May 2022, #04; Thu, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,12 +13,8 @@ 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
-The 2.36 release turned out to be a release with unusually high
17
-number of regressions. Git 2.36.1 has been tagged to deliver fixes
18
-to a handful of them.
19
-
20
-There unfortunately are a few more whose fixes have not been
21
-adequately reviewed or agreed upon.
16
+There unfortunately are still a few regressions whose fixes have
17
+been reviewed but not yet rerolled.
18
19
- hooks no longer is connected directly to the standard output.
20
cf. <CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com>
@@ -26,7 +22,11 @@ adequately reviewed or agreed upon.
22
- "sudo make install" does not work out-of-the-box.
23
cf. <4ef9287b-6260-9538-7c89-cffb611520ee@maurel.de>
24
29
-These fixed soon, a new maintenance release needs to follow.
25
+With these fixed soon, a new maintenance release needs to follow.
26
+
27
+The tip of 'next' has been rewound and rebuilt, after the remaining
28
+topics that have been cooking in 'next' from the previous cycle have
29
+been flushed to 'master'.
30
31
This cycle will conclude in early July (https://tinyurl.com/gitCal);
32
we are in week #3 of the cycle.
@@ -60,43 +60,244 @@ Release tarballs are available at:
60
https://www.kernel.org/pub/software/scm/git/
61
62
--------------------------------------------------
63
-[New Topics]
63
+[Graduated to 'master']
64
65
-* cd/bisect-messages-from-pre-flight-states (2022-05-06) 2 commits
66
- - bisect: output bisect setup status in bisect log
67
- - bisect: output state before we are ready to compute bisection
65
+* ab/misc-cleanup (2022-04-01) 6 commits
66
+ (merged to 'next' on 2022-04-04 at c5fb674865)
67
+ + alloc.[ch]: remove alloc_report() function
68
+ + object-store.h: remove unused has_sha1_file*()
69
+ + pack-bitmap-write: remove unused bitmap_reset() function
70
+ + xdiff/xmacros.h: remove unused XDL_PTRFREE
71
+ + configure.ac: remove USE_PIC comment
72
+ + run-command.h: remove always unused "clean_on_exit_handler_cbdata"
73
69
- "git bisect" was too silent before it is ready to start computing
70
- the actual bisection, which has been corrected.
74
+ Code clean-up.
75
+ source: <cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com>
76
72
- Expecting a (hopefully final) reroll.
73
- cf. <xmqqh762le32.fsf@gitster.g>
74
- source: <cover.1651796862.git.chris@chrisdown.name>
77
78
+* ah/rebase-keep-base-fix (2022-04-21) 1 commit
79
+ (merged to 'next' on 2022-05-02 at 8e6071e208)
80
+ + rebase: use correct base for --keep-base when a branch is given
81
77
-* mg/detect-compiler-in-c-locale (2022-05-09) 1 commit
78
- - detect-compiler: make detection independent of locale
82
+ "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
83
+ commit to rebase onto incorrectly, which has been corrected.
84
+ source: <20220421044233.894255-1-alexhenrie24@gmail.com>
85
80
- Build procedure fixup.
86
82
- Will merge to 'next'.
83
- source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
87
+* ea/progress-partial-blame (2022-04-06) 1 commit
88
+ (merged to 'next' on 2022-04-07 at 7df8392d71)
89
+ + blame: report correct number of lines in progress when using ranges
90
91
+ The progress meter of "git blame" was showing incorrect numbers
92
+ when processing only parts of the file.
93
+ source: <20220406181320.16911-1-eantoranz@gmail.com>
94
86
-* gc/pull-recurse-submodules (2022-05-10) 1 commit
87
- - pull: only pass '--recurse-submodules' to subcommands
95
89
- "git pull" without "--recurse-submodules=<arg>" made
90
- submodule.recurse take precedence over fetch.recurseSubmodules by
91
- mistake, which has been corrected.
96
+* ea/rebase-code-simplify (2022-04-20) 1 commit
97
+ (merged to 'next' on 2022-05-02 at 88ed49c2d0)
98
+ + rebase: simplify an assignment of options.type in cmd_rebase
99
93
- Expecting a reroll to retitle it.
94
- cf. <3234941c-5190-819f-fe3a-f528942c6b44@gmail.com>
95
- source: <pull.1262.v2.git.git.1652210747614.gitgitgadget@gmail.com>
100
+ Code clean-up.
101
+ source: <20220418172721.215898-1-eantoranz@gmail.com>
102
+
103
+
104
+* fr/vimdiff-layout (2022-04-03) 4 commits
105
+ (merged to 'next' on 2022-04-04 at 5d1c8197d0)
106
+ + mergetools: add description to all diff/merge tools
107
+ + vimdiff: add tool documentation
108
+ + vimdiff: integrate layout tests in the unit tests framework ('t' folder)
109
+ + vimdiff: new implementation with layout support
110
+
111
+ Reimplement "vimdiff[123]" mergetool drivers with a more generic
112
+ layout mechanism.
113
+ source: <20220330191909.294610-1-greenfoo@u92.eu>
114
+
115
+
116
+* jh/p4-various-fixups (2022-04-01) 22 commits
117
+ (merged to 'next' on 2022-04-04 at 251b14976f)
118
+ + git-p4: sort imports
119
+ + git-p4: seperate multiple statements onto seperate lines
120
+ + git-p4: move inline comments to line above
121
+ + git-p4: only seperate code blocks by a single empty line
122
+ + git-p4: compare to singletons with "is" and "is not"
123
+ + git-p4: normalize indentation of lines in conditionals
124
+ + git-p4: ensure there is a single space around all operators
125
+ + git-p4: ensure every comment has a single #
126
+ + git-p4: remove spaces between dictionary keys and colons
127
+ + git-p4: remove redundant backslash-continuations inside brackets
128
+ + git-p4: remove extraneous spaces before function arguments
129
+ + git-p4: place a single space after every comma
130
+ + git-p4: removed brackets when assigning multiple return values
131
+ + git-p4: remove spaces around default arguments
132
+ + git-p4: remove padding from lists, tuples and function arguments
133
+ + git-p4: sort and de-duplcate pylint disable list
134
+ + git-p4: remove commented code
135
+ + git-p4: convert descriptive class and function comments into docstrings
136
+ + git-p4: improve consistency of docstring formatting
137
+ + git-p4: indent with 4-spaces
138
+ + git-p4: remove unneeded semicolons from statements
139
+ + git-p4: add blank lines between functions and class definitions
140
+
141
+ Various cleanups to "git p4".
142
+ source: <20220401142504.58995-1-jholdsworth@nvidia.com>
143
+
144
+
145
+* kt/commit-graph-plug-fp-leak-on-error (2022-04-20) 1 commit
146
+ (merged to 'next' on 2022-05-02 at c3bcb92518)
147
+ + commit-graph: close file before returning NULL
148
+
149
+ Fix a leak of FILE * in an error codepath.
150
+ source: <pull.1213.git.1650302007395.gitgitgadget@gmail.com>
151
+
152
+
153
+* pw/test-malloc-with-sanitize-address (2022-04-11) 1 commit
154
+ (merged to 'next' on 2022-05-02 at a25766055f)
155
+ + tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
156
+
157
+ Avoid problems from interaction between malloc_check and address
158
+ sanitizer.
159
+ source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com>
160
+
161
+
162
+* rs/commit-summary-wo-break-rewrite (2022-04-06) 1 commit
163
+ (merged to 'next' on 2022-05-02 at c40509b820)
164
+ + commit, sequencer: turn off break_opt for commit summary
165
+
166
+ The commit summary shown after making a commit is matched to what
167
+ is given in "git status" not to use the break-rewrite heuristics.
168
+ source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de>
169
+
170
+
171
+* tk/untracked-cache-with-uall (2022-04-01) 2 commits
172
+ (merged to 'next' on 2022-04-04 at 2e11f1ac0c)
173
+ + untracked-cache: support '--untracked-files=all' if configured
174
+ + untracked-cache: test untracked-cache-bypassing behavior with -uall
175
+
176
+ The performance of the "untracked cache" feature has been improved
177
+ when "--untracked-files=<mode>" and "status.showUntrackedFiles"
178
+ are combined.
179
+ source: <pull.985.v6.git.1648742535.gitgitgadget@gmail.com>
180
+
181
+--------------------------------------------------
182
+[New Topics]
183
+
184
+* gg/worktree-from-the-above (2022-05-11) 2 commits
185
+ - dir: minor refactoring / clean-up
186
+ - dir: consider worktree config in path recursion
187
+
188
+ With a non-bare repository, with core.worktree pointing at a
189
+ directory that has the repository as its subdirectory, regressed in
190
+ Git 2.27 days.
191
+
192
+ Expecting a reroll.
193
+ source: <20220510171527.25778-1-ggossdev@gmail.com>
194
+
195
+
196
+* jc/update-ozlabs-url (2022-05-11) 1 commit
197
+ (merged to 'next' on 2022-05-12 at d6b14040b6)
198
+ + SubmittingPatches: use more stable git.ozlabs.org URL
199
+
200
+ Will merge to 'master'.
201
+
202
+
203
+* jc/archive-add-file-normalize-mode (2022-05-12) 1 commit
204
+ - archive: do not let on-disk mode leak to zip archives
205
+
206
+ "git archive --add-file=<path>" picked up the raw permission bits
207
+ from the path and propagated to zip output in some cases, without
208
+ normalization, which has been corrected (tar output did not have
209
+ this issue).
210
+
211
+ Will merge to 'next'?
212
+ source: <xmqqmtfme8v6.fsf@gitster.g>
213
214
--------------------------------------------------
215
[Stalled]
216
217
+* js/bisect-in-c (2022-02-23) 14 commits
218
+ - bisect: no longer try to clean up left-over `.git/head-name` files
219
+ - bisect: remove Cogito-related code
220
+ - bisect: turn `git bisect` into a full built-in
221
+ - bisect: move even the option parsing to `bisect--helper`
222
+ - bisect--helper: return only correct exit codes in `cmd_*()`
223
+ - bisect--helper: move the `BISECT_STATE` case to the end
224
+ - bisect--helper: make `--bisect-state` optional
225
+ - bisect--helper: align the sub-command order with git-bisect.sh
226
+ - bisect--helper: using `--bisect-state` without an argument is a bug
227
+ - bisect--helper: really retire `--bisect-autostart`
228
+ - bisect--helper: really retire --bisect-next-check
229
+ - bisect--helper: retire the --no-log option
230
+ - bisect: avoid double-quoting when printing the failed command
231
+ - bisect run: fix the error message
232
+
233
+ Final bits of "git bisect.sh" have been rewritten in C.
234
+
235
+ Expecting a reroll.
236
+ cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>
237
+ source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
238
+
239
+
240
+* et/xdiff-indirection (2022-02-17) 1 commit
241
+ - xdiff: provide indirection to git functions
242
+
243
+ Insert a layer of preprocessor macros for common functions in xdiff
244
+ codebase.
245
+
246
+ Expecting a reroll.
247
+ cf. <xmqqbkyudb8n.fsf@gitster.g>
248
+ source: <20220217225408.GB7@edef91d97c94>
249
+
250
+
251
+* js/ci-github-workflow-markup (2022-03-01) 9 commits
252
+ - ci: call `finalize_test_case_output` a little later
253
+ - ci: use `--github-workflow-markup` in the GitHub workflow
254
+ - ci: optionally mark up output in the GitHub workflow
255
+ - test(junit): avoid line feeds in XML attributes
256
+ - tests: refactor --write-junit-xml code
257
+ - ci/run-build-and-tests: add some structure to the GitHub workflow output
258
+ - ci: make it easier to find failed tests' logs in the GitHub workflow
259
+ - ci/run-build-and-tests: take a more high-level view
260
+ - ci: fix code style
261
+
262
+ Update the GitHub workflow support to make it quicker to get to the
263
+ failing test.
264
+
265
+ Expecting a reroll.
266
+ cf. <52382f7c-5b6a-63b6-2eb2-26c12f31f529@gmail.com>
267
+ source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
268
+
269
+
270
+* bc/stash-export (2022-04-08) 4 commits
271
+ - builtin/stash: provide a way to import stashes from a ref
272
+ - builtin/stash: provide a way to export stashes to a ref
273
+ - builtin/stash: factor out revision parsing into a function
274
+ - object-name: make get_oid quietly return an error
275
+
276
+ A mechanism to export and import stash entries to and from a normal
277
+ commit to transfer it across repositories has been introduced.
278
+
279
+ Expecting a reroll.
280
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
281
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
282
+
283
+
284
+* ab/hooks-regression-fix (2022-04-21) 6 commits
285
+ - hook API: fix v2.36.0 regression: hooks should be connected to a TTY
286
+ - hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
287
+ - hook tests: fix redirection logic error in 96e7225b310
288
+ - run-command: add an "ungroup" option to run_process_parallel()
289
+ - run-command tests: test stdout of run_command_parallel()
290
+ - run-command API: replace run_processes_parallel_tr2() with opts struct
291
+
292
+ In Git 2.36 we revamped the way how hooks are invoked. One change
293
+ that is end-user visible is that the output of a hook is no longer
294
+ directly connected to the standard output of "git" that spawns the
295
+ hook, which was noticed post release. This is getting corrected.
296
+
297
+ Expecting a reroll.
298
+ source: <cover-0.6-00000000000-20220421T122108Z-avarab@gmail.com>
299
+
300
+
301
* js/wait-or-whine-can-fail (2022-04-28) 1 commit
302
- run-command: don't spam trace2_child_exit()
303
@@ -107,17 +308,6 @@ Release tarballs are available at:
308
source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
309
310
110
-* ab/commit-plug-leaks (2022-02-16) 2 commits
111
- - commit: use strbuf_release() instead of UNLEAK()
112
- - commit: fix "author_ident" leak
113
-
114
- Leakfixes in the top-level called-once function.
115
-
116
- Expecting a reroll.
117
- I think UNLEAK->strbuf_release() is a regression.
118
- source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
119
-
120
-
311
* dl/prompt-pick-fix (2022-03-25) 1 commit
312
. git-prompt: fix sequencer/todo detection
313
@@ -164,6 +354,62 @@ Release tarballs are available at:
354
--------------------------------------------------
355
[Cooking]
356
357
+* ab/commit-plug-leaks (2022-05-12) 1 commit
358
+ - commit: fix "author_ident" leak
359
+
360
+ Leakfix in the top-level called-once function.
361
+
362
+ Will merge to 'next'?
363
+ source: <xmqqzgjmcqlg.fsf@gitster.g>
364
+
365
+
366
+* ab/valgrind-fixes (2022-05-12) 4 commits
367
+ - commit-graph.c: don't assume that stat() succeeds
368
+ - object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
369
+ - log test: skip a failing mkstemp() test under valgrind
370
+ - tests: using custom GIT_EXEC_PATH breaks --valgrind tests
371
+
372
+ A bit of test framework fixes with a few fixes to issues found by
373
+ valgrind.
374
+
375
+ Will merge to 'next'?
376
+ source: <20220512223218.237544-1-gitster@pobox.com>
377
+
378
+
379
+* cd/bisect-messages-from-pre-flight-states (2022-05-11) 2 commits
380
+ (merged to 'next' on 2022-05-12 at 0e6072fb45)
381
+ + bisect: output bisect setup status in bisect log
382
+ + bisect: output state before we are ready to compute bisection
383
+
384
+ "git bisect" was too silent before it is ready to start computing
385
+ the actual bisection, which has been corrected.
386
+
387
+ Will merge to 'master'.
388
+ source: <cover.1652291688.git.chris@chrisdown.name>
389
+
390
+
391
+* mg/detect-compiler-in-c-locale (2022-05-09) 1 commit
392
+ (merged to 'next' on 2022-05-12 at 58c7d6e461)
393
+ + detect-compiler: make detection independent of locale
394
+
395
+ Build procedure fixup.
396
+
397
+ Will merge to 'master'.
398
+ source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
399
+
400
+
401
+* gc/pull-recurse-submodules (2022-05-11) 1 commit
402
+ (merged to 'next' on 2022-05-12 at fe15c34c7a)
403
+ + pull: do not let submodule.recurse override fetch.recurseSubmodules
404
+
405
+ "git pull" without "--recurse-submodules=<arg>" made
406
+ submodule.recurse take precedence over fetch.recurseSubmodules by
407
+ mistake, which has been corrected.
408
+
409
+ Will merge to 'master'.
410
+ source: <pull.1262.v2.git.git.1652210747614.gitgitgadget@gmail.com>
411
+
412
+
413
* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
414
- builtin/remote.c: teach `-v` to list filters for promisor remotes
415
@@ -184,16 +430,17 @@ Release tarballs are available at:
430
431
432
* js/trace2-doc-fixes (2022-05-04) 6 commits
187
- - trace2 docs: add missing full stop
188
- - trace2 docs: clarify what `varargs` is all about
189
- - trace2 docs: fix a JSON formatted example
190
- - trace2 docs: surround more terms in backticks
191
- - trace2 docs: "printf" is not an English word
192
- - trace2 docs: a couple of grammar fixes
433
+ (merged to 'next' on 2022-05-12 at b37c6a8c2e)
434
+ + trace2 docs: add missing full stop
435
+ + trace2 docs: clarify what `varargs` is all about
436
+ + trace2 docs: fix a JSON formatted example
437
+ + trace2 docs: surround more terms in backticks
438
+ + trace2 docs: "printf" is not an English word
439
+ + trace2 docs: a couple of grammar fixes
440
441
Trace2 documentation updates.
442
196
- Will merge to 'next'.
443
+ Will merge to 'master'.
444
source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
445
446
@@ -268,93 +515,50 @@ Release tarballs are available at:
515
516
With a recent update to refuse access to repositories of other
517
people by default, "sudo make install" and "sudo git describe"
271
- stopped working. This series intends to loosen it while keeping
272
- the safety.
273
-
274
- Will merge to 'next'?
275
- source: <20220510174616.18629-1-carenas@gmail.com>
276
-
277
-
278
-* pb/ggg-in-mfc-doc (2022-04-27) 3 commits
279
- - MyFirstContribution: drop PR description for GGG single-patch contributions
280
- - MyFirstContribution: also explain cover letter in GitGitGadget section
281
- - MyFirstContribution: move cover letter description to a separate file
282
-
283
- Documentation update.
284
-
285
- Expecting a reroll.
286
- cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com>
287
- source: <pull.1226.git.1651086288.gitgitgadget@gmail.com>
288
-
289
-
290
-* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
291
- - safe.directory: document and check that it's ignored in the environment
292
- - t0033-safe-directory: check when 'safe.directory' is ignored
293
- - t0033-safe-directory: check the error message without matching the trash dir
294
-
295
- New tests for the safe.directory mechanism.
296
-
297
- Will merge to 'next'.
298
- source: <20220427170649.4949-1-szeder.dev@gmail.com>
299
-
300
-
301
-* ah/rebase-keep-base-fix (2022-04-21) 1 commit
302
- (merged to 'next' on 2022-05-02 at 8e6071e208)
303
- + rebase: use correct base for --keep-base when a branch is given
304
-
305
- "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
306
- commit to rebase onto incorrectly, which has been corrected.
307
-
308
- Will merge to 'master'.
309
- source: <20220421044233.894255-1-alexhenrie24@gmail.com>
310
-
311
-
312
-* cg/tools-for-git-doc (2022-04-21) 1 commit
313
- - Documentation/ToolsForGit.txt: Tools for developing Git
314
-
315
- A new doc that lists tips for tools to work with Git's codebase.
518
+ stopped working. This series intends to loosen it while keeping
519
+ the safety.
520
317
- Thoughts?
318
- source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
521
+ Will merge to 'next'?
522
+ source: <20220510174616.18629-1-carenas@gmail.com>
523
524
321
-* ea/rebase-code-simplify (2022-04-20) 1 commit
322
- (merged to 'next' on 2022-05-02 at 88ed49c2d0)
323
- + rebase: simplify an assignment of options.type in cmd_rebase
525
+* pb/ggg-in-mfc-doc (2022-05-10) 5 commits
526
+ - MyFirstContribution: drop PR description for GGG single-patch contributions
527
+ - MyFirstContribution: reference "The cover letter" in GitGitGadget section
528
+ - MyFirstContribution: reference "The cover letter" in "Preparing Email"
529
+ - MyFirstContribution: add standalone section on cover letter
530
+ - MyFirstContribution: add "Anatomy of a Patch Series" section
531
325
- Code clean-up.
532
+ Documentation update.
533
327
- Will merge to 'master'.
328
- source: <20220418172721.215898-1-eantoranz@gmail.com>
534
+ Expecting a reroll.
535
+ cf. <a955b9f1-3e11-70c5-b390-a35b420d6835@gmail.com>
536
+ source: <pull.1226.v2.git.1652233654.gitgitgadget@gmail.com>
537
538
331
-* kt/commit-graph-plug-fp-leak-on-error (2022-04-20) 1 commit
332
- (merged to 'next' on 2022-05-02 at c3bcb92518)
333
- + commit-graph: close file before returning NULL
539
+* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
540
+ (merged to 'next' on 2022-05-12 at 2a6a11d6bf)
541
+ + safe.directory: document and check that it's ignored in the environment
542
+ + t0033-safe-directory: check when 'safe.directory' is ignored
543
+ + t0033-safe-directory: check the error message without matching the trash dir
544
335
- Fix a leak of FILE * in an error codepath.
545
+ New tests for the safe.directory mechanism.
546
547
Will merge to 'master'.
338
- source: <pull.1213.git.1650302007395.gitgitgadget@gmail.com>
548
+ source: <20220427170649.4949-1-szeder.dev@gmail.com>
549
550
341
-* ab/valgrind-fixes (2022-04-21) 4 commits
342
- - object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
343
- - commit-graph.c: don't assume that stat() succeeds
344
- - log test: skip a failing mkstemp() test under valgrind
345
- - tests: make RUNTIME_PREFIX compatible with --valgrind
551
+* cg/tools-for-git-doc (2022-04-21) 1 commit
552
+ - Documentation/ToolsForGit.txt: Tools for developing Git
553
347
- A bit of test framework fixes with a few fixes to issues found by
348
- valgrind.
554
+ A new doc that lists tips for tools to work with Git's codebase.
555
350
- Expecting a reroll.
351
- source: <cover-0.4-00000000000-20220421T200733Z-avarab@gmail.com>
556
+ Thoughts?
557
+ source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
558
559
354
-* cb/ci-make-p4-optional (2022-04-25) 6 commits
355
- - fixup! ci: make failure to find perforce more user friendly
356
- - fixup! CI: use https, not http to download binaries from perforce.com
357
- - CI: use https, not http to download binaries from perforce.com
560
+* cb/ci-make-p4-optional (2022-05-12) 4 commits
561
+ - ci: use https, not http to download binaries from perforce.com
562
- ci: reintroduce prevention from perforce being quarantined in macOS
563
- ci: avoid brew for installing perforce
564
- ci: make failure to find perforce more user friendly
@@ -364,9 +568,8 @@ Release tarballs are available at:
568
failing the whole CI job, just let it skip the p4 tests when this
569
happens.
570
367
- Expecting a reroll.
368
- source: <20220423142559.32507-1-carenas@gmail.com>
369
- source: <0220423142559.32507-5-carenas@gmail.com>
571
+ Will merge to 'next'?
572
+ source: <20220512223940.238367-1-gitster@pobox.com>
573
574
575
* jc/show-branch-g-current (2022-04-21) 1 commit
@@ -379,33 +582,17 @@ Release tarballs are available at:
582
583
584
* rs/external-diff-tempfile (2022-04-20) 2 commits
382
- - diff: use mks_tempfile_dt()
383
- - tempfile: add mks_tempfile_dt()
585
+ (merged to 'next' on 2022-05-12 at b357b518b3)
586
+ + diff: use mks_tempfile_dt()
587
+ + tempfile: add mks_tempfile_dt()
588
589
The temporary files fed to external diff command are now generated
590
inside a new temporary directory under the same basename.
591
388
- Will merge to 'next'.
592
+ Will merge to 'master'.
593
source: <2ad1dd80-e79f-7304-219c-db24bb269c4d@web.de>
594
595
392
-* ab/hooks-regression-fix (2022-04-21) 6 commits
393
- - hook API: fix v2.36.0 regression: hooks should be connected to a TTY
394
- - hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
395
- - hook tests: fix redirection logic error in 96e7225b310
396
- - run-command: add an "ungroup" option to run_process_parallel()
397
- - run-command tests: test stdout of run_command_parallel()
398
- - run-command API: replace run_processes_parallel_tr2() with opts struct
399
-
400
- In Git 2.36 we revamped the way how hooks are invoked. One change
401
- that is end-user visible is that the output of a hook is no longer
402
- directly connected to the standard output of "git" that spawns the
403
- hook, which was noticed post release. This is getting corrected.
404
-
405
- Expecting a reroll.
406
- source: <cover-0.6-00000000000-20220421T122108Z-avarab@gmail.com>
407
-
408
-
596
* ar/send-email-confirm-by-default (2022-04-22) 1 commit
597
- send-email: always confirm by default
598
@@ -417,7 +604,8 @@ Release tarballs are available at:
604
605
606
* mv/log-since-as-filter (2022-04-23) 1 commit
420
- - log: "--since-as-filter" option is a non-terminating "--since" variant
607
+ (merged to 'next' on 2022-05-12 at dc93e4e93a)
608
+ + log: "--since-as-filter" option is a non-terminating "--since" variant
609
610
"git log --since=X" will stop traversal upon seeing a commit that
611
is older than X, but there may be commits behind it that is younger
@@ -425,16 +613,17 @@ Release tarballs are available at:
613
option is added to keep digging without stopping, and instead
614
filter out commits with timestamp older than X.
615
428
- Will merge to 'next'.
616
+ Will merge to 'master'.
617
source: <YmP4TaYmSEi6GeB4@vmiklos.hu>
618
619
620
* ds/do-not-call-bug-on-bad-refs (2022-04-25) 1 commit
433
- - clone: die() instead of BUG() on bad refs
621
+ (merged to 'next' on 2022-05-12 at af4d003dfb)
622
+ + clone: die() instead of BUG() on bad refs
623
624
Code clean-up.
625
437
- Will merge to 'next'.
626
+ Will merge to 'master'.
627
source: <pull.1214.v2.git.1650894450441.gitgitgadget@gmail.com>
628
629
@@ -453,11 +642,12 @@ Release tarballs are available at:
642
643
644
* sa/t1011-use-helpers (2022-04-12) 1 commit
456
- - t1011: replace test -f with test_path_is_file
645
+ (merged to 'next' on 2022-05-12 at 5bed8531e3)
646
+ + t1011: replace test -f with test_path_is_file
647
648
A GSoC practice.
649
460
- Will merge to 'next'.
650
+ Will merge to 'master'.
651
source: <20220412203722.10484-1-siddharthasthana31@gmail.com>
652
653
@@ -467,98 +657,84 @@ Release tarballs are available at:
657
source: <20220414022513.31465-1-gitter.spiros@gmail.com>
658
659
470
-* pw/test-malloc-with-sanitize-address (2022-04-11) 1 commit
471
- (merged to 'next' on 2022-05-02 at a25766055f)
472
- + tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
473
-
474
- Avoid problems from interaction between malloc_check and address
475
- sanitizer.
476
-
477
- Will merge to 'master'.
478
- source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com>
479
-
480
-
660
* rs/t7812-pcre2-ws-bug-test (2022-04-11) 1 commit
482
- - t7812: test PCRE2 whitespace bug
661
+ (merged to 'next' on 2022-05-12 at 0e0ce3b493)
662
+ + t7812: test PCRE2 whitespace bug
663
664
A test to ensure workaround for an earlier pcre2 bug does work.
665
486
- Will merge to 'next'.
666
+ Will merge to 'master'.
667
source: <3a49649d-8ff9-e5a7-e3fd-33fee5068ae8@web.de>
668
669
670
* ah/convert-warning-message (2022-04-08) 1 commit
491
- - convert: clarify line ending conversion warning
671
+ (merged to 'next' on 2022-05-12 at a9f8f32904)
672
+ + convert: clarify line ending conversion warning
673
674
Update a few end-user facing messages around eol conversion.
675
495
- Will merge to 'next'.
676
+ Will merge to 'master'.
677
source: <20220408044154.9947-1-alexhenrie24@gmail.com>
678
679
680
* cg/vscode-with-gdb (2022-04-08) 1 commit
500
- - contrib/vscode/: debugging with VS Code and gdb
681
+ (merged to 'next' on 2022-05-12 at 2635bf0c8c)
682
+ + contrib/vscode/: debugging with VS Code and gdb
683
684
VS code configuration updates.
685
504
- Will merge to 'next'.
686
+ Will merge to 'master'.
687
source: <20220407204001.112287-2-cogoni.guillaume@gmail.com>
688
689
690
* gf/unused-includes (2022-04-06) 2 commits
509
- - apply.c: remove unnecessary include
510
- - serve.c: remove unnecessary include
691
+ (merged to 'next' on 2022-05-12 at 690a2d8976)
692
+ + apply.c: remove unnecessary include
693
+ + serve.c: remove unnecessary include
694
695
Remove unused includes.
696
514
- Will merge to 'next'.
697
+ Will merge to 'master'.
698
source: <20220331194436.58005-1-garrit@slashdev.space>
699
700
701
* km/t3501-use-test-helpers (2022-04-06) 1 commit
519
- - t3501: remove test -f and stop ignoring git <cmd> exit code
702
+ (merged to 'next' on 2022-05-12 at 66c5cd1c32)
703
+ + t3501: remove test -f and stop ignoring git <cmd> exit code
704
705
Test script updates.
706
523
- Will merge to 'next'.
707
+ Will merge to 'master'.
708
source: <20220405134742.17526-2-khalid.masum.92@gmail.com>
709
710
711
* pb/submodule-recurse-mode-enum (2022-04-06) 1 commit
528
- - submodule.h: use a named enum for RECURSE_SUBMODULES_*
712
+ (merged to 'next' on 2022-05-12 at 1164a4c9b7)
713
+ + submodule.h: use a named enum for RECURSE_SUBMODULES_*
714
715
Small code clean-up.
716
532
- Will merge to 'next'.
533
- source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
534
-
535
-
536
-* rs/commit-summary-wo-break-rewrite (2022-04-06) 1 commit
537
- (merged to 'next' on 2022-05-02 at c40509b820)
538
- + commit, sequencer: turn off break_opt for commit summary
539
-
540
- The commit summary shown after making a commit is matched to what
541
- is given in "git status" not to use the break-rewrite heuristics.
542
-
717
Will merge to 'master'.
544
- source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de>
718
+ source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
719
720
721
* tk/p4-utf8-bom (2022-04-06) 1 commit
548
- - git-p4: preserve utf8 BOM when importing from p4 to git
722
+ (merged to 'next' on 2022-05-12 at 7bb2e70e7b)
723
+ + git-p4: preserve utf8 BOM when importing from p4 to git
724
725
"git p4" update.
726
552
- Will merge to 'next'.
727
+ Will merge to 'master'.
728
source: <pull.1203.git.1649051436934.gitgitgadget@gmail.com>
729
730
731
* tk/p4-with-explicity-sync (2022-04-06) 1 commit
557
- - git-p4: support explicit sync of arbitrary existing git-p4 refs
732
+ (merged to 'next' on 2022-05-12 at 81e662edae)
733
+ + git-p4: support explicit sync of arbitrary existing git-p4 refs
734
735
"git p4" update.
736
561
- Will merge to 'next'.
737
+ Will merge to 'master'.
738
source: <pull.1202.git.1649049054600.gitgitgadget@gmail.com>
739
740
@@ -573,40 +749,15 @@ Release tarballs are available at:
749
source: <cover-0.3-00000000000-20220406T104134Z-avarab@gmail.com>
750
751
576
-* ab/misc-cleanup (2022-04-01) 6 commits
577
- (merged to 'next' on 2022-04-04 at c5fb674865)
578
- + alloc.[ch]: remove alloc_report() function
579
- + object-store.h: remove unused has_sha1_file*()
580
- + pack-bitmap-write: remove unused bitmap_reset() function
581
- + xdiff/xmacros.h: remove unused XDL_PTRFREE
582
- + configure.ac: remove USE_PIC comment
583
- + run-command.h: remove always unused "clean_on_exit_handler_cbdata"
584
-
585
- Code clean-up.
586
-
587
- Will merge to 'master'.
588
- source: <cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com>
589
-
590
-
752
* gf/shorthand-version-and-help (2022-03-31) 1 commit
592
- - cli: add -v and -h shorthands
753
+ (merged to 'next' on 2022-05-12 at 54ca8b25e0)
754
+ + cli: add -v and -h shorthands
755
756
"git -v" and "git -h" are now understood as "git --version" and
757
"git --help".
758
597
- Will merge to 'next'.
598
- source: <20220331212709.36036-1-garrit@slashdev.space>
599
-
600
-
601
-* ea/progress-partial-blame (2022-04-06) 1 commit
602
- (merged to 'next' on 2022-04-07 at 7df8392d71)
603
- + blame: report correct number of lines in progress when using ranges
604
-
605
- The progress meter of "git blame" was showing incorrect numbers
606
- when processing only parts of the file.
607
-
759
Will merge to 'master'.
609
- source: <20220406181320.16911-1-eantoranz@gmail.com>
760
+ source: <20220331212709.36036-1-garrit@slashdev.space>
761
762
763
* ab/plug-leak-in-revisions (2022-04-13) 28 commits
@@ -703,7 +854,8 @@ Release tarballs are available at:
854
855
856
* kf/p4-multiple-remotes (2022-03-21) 1 commit
706
- - git-p4: fix issue with multiple perforce remotes
857
+ (merged to 'next' on 2022-05-12 at 447ed8ee3e)
858
+ + git-p4: fix issue with multiple perforce remotes
859
860
"git p4" update.
861
@@ -711,34 +863,6 @@ Release tarballs are available at:
863
source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
864
865
714
-* fr/vimdiff-layout (2022-04-03) 4 commits
715
- (merged to 'next' on 2022-04-04 at 5d1c8197d0)
716
- + mergetools: add description to all diff/merge tools
717
- + vimdiff: add tool documentation
718
- + vimdiff: integrate layout tests in the unit tests framework ('t' folder)
719
- + vimdiff: new implementation with layout support
720
-
721
- Reimplement "vimdiff[123]" mergetool drivers with a more generic
722
- layout mechanism.
723
-
724
- Will merge to 'master'.
725
- source: <20220330191909.294610-1-greenfoo@u92.eu>
726
-
727
-
728
-* bc/stash-export (2022-04-08) 4 commits
729
- - builtin/stash: provide a way to import stashes from a ref
730
- - builtin/stash: provide a way to export stashes to a ref
731
- - builtin/stash: factor out revision parsing into a function
732
- - object-name: make get_oid quietly return an error
733
-
734
- A mechanism to export and import stash entries to and from a normal
735
- commit to transfer it across repositories has been introduced.
736
-
737
- Expecting a reroll.
738
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
739
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
740
-
741
-
866
* ns/batch-fsync (2022-04-06) 13 commits
867
- core.fsyncmethod: performance tests for batch mode
868
- t/perf: add iteration setup mechanism to perf-lib
@@ -807,36 +931,6 @@ Release tarballs are available at:
931
source: <cover.1646266835.git.me@ttaylorr.com>
932
933
810
-* js/ci-github-workflow-markup (2022-03-01) 9 commits
811
- - ci: call `finalize_test_case_output` a little later
812
- - ci: use `--github-workflow-markup` in the GitHub workflow
813
- - ci: optionally mark up output in the GitHub workflow
814
- - test(junit): avoid line feeds in XML attributes
815
- - tests: refactor --write-junit-xml code
816
- - ci/run-build-and-tests: add some structure to the GitHub workflow output
817
- - ci: make it easier to find failed tests' logs in the GitHub workflow
818
- - ci/run-build-and-tests: take a more high-level view
819
- - ci: fix code style
820
-
821
- Update the GitHub workflow support to make it quicker to get to the
822
- failing test.
823
-
824
- Expecting a reroll.
825
- cf. <52382f7c-5b6a-63b6-2eb2-26c12f31f529@gmail.com>
826
- source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
827
-
828
-
829
-* et/xdiff-indirection (2022-02-17) 1 commit
830
- - xdiff: provide indirection to git functions
831
-
832
- Insert a layer of preprocessor macros for common functions in xdiff
833
- codebase.
834
-
835
- Expecting a reroll.
836
- cf. <xmqqbkyudb8n.fsf@gitster.g>
837
- source: <20220217225408.GB7@edef91d97c94>
838
-
839
-
934
* tk/simple-autosetupmerge (2022-04-29) 3 commits
935
- push: new config option "push.autoSetupRemote" supports "simple" push
936
- push: default to single remote even when not named origin
@@ -847,20 +941,9 @@ Release tarballs are available at:
941
-c push.default=simple" on branch $A would push to update the
942
branch $A at the remote $B came from. Also more places use the
943
sole remote, if exists, before defaulting to 'origin'.
850
- source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
851
-
852
-
853
-* tk/untracked-cache-with-uall (2022-04-01) 2 commits
854
- (merged to 'next' on 2022-04-04 at 2e11f1ac0c)
855
- + untracked-cache: support '--untracked-files=all' if configured
856
- + untracked-cache: test untracked-cache-bypassing behavior with -uall
944
858
- The performance of the "untracked cache" feature has been improved
859
- when "--untracked-files=<mode>" and "status.showUntrackedFiles"
860
- are combined.
861
-
862
- Will merge to 'master'.
863
- source: <pull.985.v6.git.1648742535.gitgitgadget@gmail.com>
945
+ Thoughts?
946
+ source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
947
948
949
* jh/builtin-fsmonitor-part3 (2022-04-22) 29 commits
@@ -895,33 +978,14 @@ Release tarballs are available at:
978
- Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
979
980
More fsmonitor--daemon.
898
- source: <pull.1143.v6.git.1650662994.gitgitgadget@gmail.com>
899
-
900
-
901
-* js/bisect-in-c (2022-02-23) 14 commits
902
- - bisect: no longer try to clean up left-over `.git/head-name` files
903
- - bisect: remove Cogito-related code
904
- - bisect: turn `git bisect` into a full built-in
905
- - bisect: move even the option parsing to `bisect--helper`
906
- - bisect--helper: return only correct exit codes in `cmd_*()`
907
- - bisect--helper: move the `BISECT_STATE` case to the end
908
- - bisect--helper: make `--bisect-state` optional
909
- - bisect--helper: align the sub-command order with git-bisect.sh
910
- - bisect--helper: using `--bisect-state` without an argument is a bug
911
- - bisect--helper: really retire `--bisect-autostart`
912
- - bisect--helper: really retire --bisect-next-check
913
- - bisect--helper: retire the --no-log option
914
- - bisect: avoid double-quoting when printing the failed command
915
- - bisect run: fix the error message
916
-
917
- Final bits of "git bisect.sh" have been rewritten in C.
981
919
- Expecting a reroll.
920
- cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>
921
- source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
982
+ Expecting a hopefully final reroll.
983
+ cf. <nycvar.QRO.7.76.6.2205121726260.352@tvgsbejvaqbjf.bet>
984
+ source: <pull.1143.v6.git.1650662994.gitgitgadget@gmail.com>
985
986
924
-* js/scalar-diagnose (2022-05-10) 7 commits
987
+* js/scalar-diagnose (2022-05-12) 8 commits
988
+ - fixup: archive: optionally add "virtual" files
989
- scalar: teach `diagnose` to gather loose objects information
990
- scalar: teach `diagnose` to gather packfile info
991
- scalar diagnose: include disk space information
@@ -931,6 +995,8 @@ Release tarballs are available at:
995
- archive: optionally add "virtual" files
996
997
Implementation of "scalar diagnose" subcommand.
998
+
999
+ Will merge to 'next' after squashing the fix in?
1000
source: <pull.1128.v4.git.1652210824.gitgitgadget@gmail.com>
1001
1002
@@ -959,37 +1025,6 @@ Release tarballs are available at:
1025
source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
1026
1027
962
-* jh/p4-various-fixups (2022-04-01) 22 commits
963
- (merged to 'next' on 2022-04-04 at 251b14976f)
964
- + git-p4: sort imports
965
- + git-p4: seperate multiple statements onto seperate lines
966
- + git-p4: move inline comments to line above
967
- + git-p4: only seperate code blocks by a single empty line
968
- + git-p4: compare to singletons with "is" and "is not"
969
- + git-p4: normalize indentation of lines in conditionals
970
- + git-p4: ensure there is a single space around all operators
971
- + git-p4: ensure every comment has a single #
972
- + git-p4: remove spaces between dictionary keys and colons
973
- + git-p4: remove redundant backslash-continuations inside brackets
974
- + git-p4: remove extraneous spaces before function arguments
975
- + git-p4: place a single space after every comma
976
- + git-p4: removed brackets when assigning multiple return values
977
- + git-p4: remove spaces around default arguments
978
- + git-p4: remove padding from lists, tuples and function arguments
979
- + git-p4: sort and de-duplcate pylint disable list
980
- + git-p4: remove commented code
981
- + git-p4: convert descriptive class and function comments into docstrings
982
- + git-p4: improve consistency of docstring formatting
983
- + git-p4: indent with 4-spaces
984
- + git-p4: remove unneeded semicolons from statements
985
- + git-p4: add blank lines between functions and class definitions
986
-
987
- Various cleanups to "git p4".
988
-
989
- Will merge to 'master'.
990
- source: <20220401142504.58995-1-jholdsworth@nvidia.com>
991
-
992
-
1028
* js/use-builtin-add-i (2021-12-01) 2 commits
1029
- add -i: default to the built-in implementation
1030
- t2016: require the PERL prereq only when necessary