Skip to content

Commit aeeceed

Browse files
committed
What's cooking (2024/07 #4)
1 parent e544875 commit aeeceed

File tree

1 file changed

+141
-65
lines changed

1 file changed

+141
-65
lines changed

whats-cooking.txt

Lines changed: 141 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
2-
Subject: What's cooking in git.git (Jul 2024, #03; Thu, 11)
3-
X-master-at: 557ae147e6cdc9db121269b058c757ac5092f9c9
4-
X-next-at: 2a221341d9b66d14d948b71e4edd3494e5dd692c
2+
Subject: What's cooking in git.git (Jul 2024, #04; Fri, 12)
3+
X-master-at: a7dae3bdc8b516d36f630b12bb01e853a667e0d9
4+
X-next-at: eb743b3ca22675107e6ba730058d59d2cf3cb6fa
55
66

7-
What's cooking in git.git (Jul 2024, #03; Thu, 11)
7+
What's cooking in git.git (Jul 2024, #04; Fri, 12)
88
--------------------------------------------------
99

1010
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,8 @@ topic without enough support may be discarded after a long period of
1717
no activity (of course they can be resubmit when new interests
1818
arise).
1919

20+
Git 2.46-rc0 has been tagged.
21+
2022
Copies of the source code to Git live in many repositories, and the
2123
following is a list of the ones I push into or their mirrors. Some
2224
repositories have only a subset of branches.
@@ -45,63 +47,102 @@ Release tarballs are available at:
4547

4648
https://www.kernel.org/pub/software/scm/git/
4749

50+
--------------------------------------------------
51+
[Graduated to 'master']
52+
53+
* as/pathspec-h-typofix (2024-07-01) 1 commit
54+
(merged to 'next' on 2024-07-02 at ae7cee4189)
55+
+ pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt"
56+
57+
Typofix.
58+
59+
60+
61+
* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit
62+
(merged to 'next' on 2024-07-02 at 06e1677920)
63+
+ submodule--helper: use strvec_pushf() for --super-prefix
64+
65+
Code clean-up.
66+
67+
4868
--------------------------------------------------
4969
[New Topics]
5070

51-
* jc/where-is-bash-for-ci (2024-07-08) 1 commit
52-
(merged to 'next' on 2024-07-09 at 14b00e672e)
53-
+ ci: unify bash calling convention
71+
* es/doc-platform-support-policy (2024-07-12) 1 commit
72+
- Documentation: add platform support policy
5473

55-
Shell script clean-up.
74+
A policy document that describes platform support levels and
75+
expectation on platform stakeholders has been introduced.
5676

57-
Will merge to 'master'.
58-
77+
What's the doneness of this one?
78+
5979

6080

61-
* kn/push-empty-fix (2024-07-09) 1 commit
62-
- builtin/push: call set_refspecs after validating remote
81+
* js/var-git-shell-path (2024-07-12) 7 commits
82+
- var(win32): do report the GIT_SHELL_PATH that is actually used
83+
- run-command: declare the `git_shell_path()` function globally
84+
- run-command(win32): resolve the path to the Unix shell early
85+
- mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too
86+
- win32: override `fspathcmp()` with a directory separator-aware version
87+
- strvec: declare the `strvec_push_nodup()` function globally
88+
- run-command: refactor getting the Unix shell path into its own function
6389

64-
"git push '' HEAD:there" used to hit a BUG(); it has been corrected
65-
to die with "fatal: bad repository ''".
90+
"git var GIT_SHELL_PATH" should report the path to the shell used
91+
to spawn external commands, but it didn't do so on Windows, which
92+
has been corrected.
6693

67-
Expecting a reroll.
68-
69-
94+
Will merge to 'next'.
95+
7096

7197

72-
* ad/merge-with-diff-algorithm (2024-07-10) 1 commit
73-
(merged to 'next' on 2024-07-11 at 2a221341d9)
74-
+ merge-recursive: honor diff.algorithm
98+
* kn/ci-clang-format (2024-07-11) 8 commits
99+
- check-whitespace: detect if no base_commit is provided
100+
- ci: run style check on GitHub and GitLab
101+
- clang-format: formalize some of the spacing rules
102+
- clang-format: avoid braces on simple single-statement bodies
103+
- clang-format: replace deprecated option with 'SpacesInParens'
104+
- clang-format: ensure files end with newlines
105+
- clang-format: avoid spacing around bitfield colon
106+
- clang-format: indent preprocessor directives after hash
75107

76-
Many Porcelain commands that internally use the merge machinery
77-
were taught to consistently honor the diff.algorithm configuration.
108+
A CI job that use clang-format to check coding style issues in new
109+
code has been added.
78110

79-
Will merge to 'master'.
80-
source: <pull.1743.v2.git.git.1720551701648.gitgitgadget@gmail.com>
111+
What's the doneness of this one?
112+
source: <20240711083043.1732288-1-karthik.188@gmail.com>
81113

82114

83-
* jc/http-cookiefile (2024-07-09) 1 commit
84-
(merged to 'next' on 2024-07-11 at abdd5711d2)
85-
+ http.c: cookie file tightening
115+
* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit
116+
- doc: update http.cookieFile with in-memory cookie processing
86117

87-
The http.cookieFile and http.saveCookies configuration variables
88-
have a few values that need to be avoided, which are now ignored
89-
with warning messages.
118+
What happens when http.cookieFile gets the special value "" has
119+
been clarified in the documentation..
90120

91-
Will merge to 'master'.
92-
121+
Will merge to 'next'.
122+
93123

94124

95-
* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit
96-
(merged to 'next' on 2024-07-11 at cec8ebb668)
97-
+ add-patch: handle splitting hunks with diff.suppressBlankEmpty
125+
* rj/add-p-pager (2024-07-12) 4 commits
126+
- add-patch: render hunks through the pager
127+
- pager: introduce wait_for_pager
128+
- pager: do not close fd 2 unnecessarily
129+
- add-patch: test for 'p' command
98130

99-
When the diff.suppressBlankEmpty configuration variable is set,
100-
"git add -p" failed to process a patch with an unmodified empty
101-
line, which has been corrected.
131+
A 'P' command to "git add -p" that passes the patch hunk to the
132+
pager has been added.
133+
134+
Expecting a (hopefully small and final) reroll.
135+
136+
102137

103-
Will merge to 'master'.
104-
138+
139+
* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit
140+
- cmake: fix build of `t-oidtree`
141+
142+
Build fix.
143+
144+
Will merge to 'next'.
145+
105146

106147
--------------------------------------------------
107148
[Stalled]
@@ -233,6 +274,61 @@ Release tarballs are available at:
233274
--------------------------------------------------
234275
[Cooking]
235276

277+
* jc/where-is-bash-for-ci (2024-07-08) 1 commit
278+
(merged to 'next' on 2024-07-09 at 14b00e672e)
279+
+ ci: unify bash calling convention
280+
281+
Shell script clean-up.
282+
283+
Will merge to 'master'.
284+
285+
286+
287+
* kn/push-empty-fix (2024-07-12) 1 commit
288+
- builtin/push: call set_refspecs after validating remote
289+
290+
"git push '' HEAD:there" used to hit a BUG(); it has been corrected
291+
to die with "fatal: bad repository ''".
292+
293+
Will merge to 'next'.
294+
295+
296+
297+
* ad/merge-with-diff-algorithm (2024-07-10) 1 commit
298+
(merged to 'next' on 2024-07-11 at 2a221341d9)
299+
+ merge-recursive: honor diff.algorithm
300+
301+
Many Porcelain commands that internally use the merge machinery
302+
were taught to consistently honor the diff.algorithm configuration.
303+
304+
Will merge to 'master'.
305+
306+
307+
308+
* jc/http-cookiefile (2024-07-09) 1 commit
309+
(merged to 'next' on 2024-07-11 at abdd5711d2)
310+
+ http.c: cookie file tightening
311+
312+
The http.cookieFile and http.saveCookies configuration variables
313+
have a few values that need to be avoided, which are now ignored
314+
with warning messages.
315+
316+
Will merge to 'master'.
317+
318+
319+
320+
* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit
321+
(merged to 'next' on 2024-07-11 at cec8ebb668)
322+
+ add-patch: handle splitting hunks with diff.suppressBlankEmpty
323+
324+
When the diff.suppressBlankEmpty configuration variable is set,
325+
"git add -p" failed to process a patch with an unmodified empty
326+
line, which has been corrected.
327+
328+
Will merge to 'master'.
329+
330+
331+
236332
* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit
237333
- checkout: special case error messages during noop switching
238334

@@ -270,7 +366,7 @@ Release tarballs are available at:
270366
271367

272368

273-
* cp/unit-test-reftable-merged (2024-07-11) 7 commits
369+
* cp/unit-test-reftable-merged (2024-07-12) 7 commits
274370
- t-reftable-merged: add test for REFTABLE_FORMAT_ERROR
275371
- t-reftable-merged: use reftable_ref_record_equal to compare ref records
276372
- t-reftable-merged: add tests for reftable_merged_table_max_update_index
@@ -282,7 +378,7 @@ Release tarballs are available at:
282378
Another reftable test has been ported to use the unit test framework.
283379

284380
Looking good.
285-
source: <20240711040854.4602[email protected]>
381+
source: <20240712055041.6476[email protected]>
286382

287383

288384
* ds/advice-sparse-index-expansion (2024-07-08) 1 commit
@@ -338,14 +434,14 @@ Release tarballs are available at:
338434
source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
339435

340436

341-
* gt/unit-test-hashmap (2024-07-08) 1 commit
437+
* gt/unit-test-hashmap (2024-07-12) 1 commit
342438
- t: port helper/test-hashmap.c to unit-tests/t-hashmap.c
343439

344440
An existing test of hashmap API has been rewritten with the
345441
unit-test framework.
346442

347-
Needs review.
348-
source: <20240708161641.10335-2[email protected]>
443+
What's the doneness of this one?
444+
source: <20240711235159.5320-1[email protected]>
349445

350446

351447
* ri/doc-show-branch-fix (2024-07-08) 1 commit
@@ -358,16 +454,6 @@ Release tarballs are available at:
358454
359455

360456

361-
* as/pathspec-h-typofix (2024-07-01) 1 commit
362-
(merged to 'next' on 2024-07-02 at ae7cee4189)
363-
+ pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt"
364-
365-
Typofix.
366-
367-
Will merge to 'master'.
368-
369-
370-
371457
* gt/unit-test-oidmap (2024-07-03) 1 commit
372458
(merged to 'next' on 2024-07-08 at 4e7394fc67)
373459
+ t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c
@@ -433,16 +519,6 @@ Release tarballs are available at:
433519
434520

435521

436-
* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit
437-
(merged to 'next' on 2024-07-02 at 06e1677920)
438-
+ submodule--helper: use strvec_pushf() for --super-prefix
439-
440-
Code clean-up.
441-
442-
Will merge to 'master'.
443-
444-
445-
446522
* rs/unit-tests-test-run (2024-07-01) 6 commits
447523
- t-strbuf: use TEST_RUN
448524
- t-strvec: use TEST_RUN

0 commit comments

Comments
 (0)