What's cooking (2022/05 #06)
Junio C Hamano committed
May 20, 2022 at 22:45 UTC
4e1daed095e20d589dcf545a6acf43943e915c4e
1 file changed
+512
-474
whats-cooking.txt
+512
-474
@@ -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, #05; Mon, 16)
4
-X-master-at: 277cf0bc36094f6dc4297d8c9cef79df045b735d
5
-X-next-at: 265bb02f2a67ce96a9eebc26ed274aaae0a30ddb
3
+Subject: What's cooking in git.git (May 2022, #06; Fri, 20)
4
+X-master-at: f9b95943b68b6b8ca5a6072f50a08411c6449b55
5
+X-next-at: 6924ef9a07fd4d97a8c929a0a7cbd41bd72df37e
6
7
-What's cooking in git.git (May 2022, #05; Mon, 16)
7
+What's cooking in git.git (May 2022, #06; Fri, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,13 +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
-There are too many topics that are marked as "Will merge to next?"
17
-that can use a gentle reminder like "no, the issue raised at $URL
18
-hasn't been resolved yet for that" or "yes, we have discussed it
19
-long and poked at it hard enough and there is no holes".
20
-
16
This cycle will conclude in early July (https://tinyurl.com/gitCal);
22
-we are in week #4 of the cycle.
17
+we have just finished the week #4 of the cycle.
18
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into or their mirrors. Some
@@ -50,89 +45,308 @@ Release tarballs are available at:
45
https://www.kernel.org/pub/software/scm/git/
46
47
--------------------------------------------------
53
-[New Topics]
48
+[Graduated to 'master']
49
55
-* tb/midx-race-in-pack-objects (2022-05-13) 2 commits
56
- - builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
57
- - pack-bitmap: check preferred pack validity when opening MIDX bitmap
50
+* ah/convert-warning-message (2022-04-08) 1 commit
51
+ (merged to 'next' on 2022-05-12 at a9f8f32904)
52
+ + convert: clarify line ending conversion warning
53
59
- The multi-pack-index code did not protect the packfile it is going
60
- to depend on from getting removed while in use, which has been
61
- corrected.
54
+ Update a few end-user facing messages around eol conversion.
55
+ source: <20220408044154.9947-1-alexhenrie24@gmail.com>
56
63
- Will merge to 'next'?
64
- source: <cover.1652458395.git.me@ttaylorr.com>
57
58
+* cb/ci-make-p4-optional (2022-05-12) 4 commits
59
+ (merged to 'next' on 2022-05-13 at 7e84679e2a)
60
+ + ci: use https, not http to download binaries from perforce.com
61
+ + ci: reintroduce prevention from perforce being quarantined in macOS
62
+ + ci: avoid brew for installing perforce
63
+ + ci: make failure to find perforce more user friendly
64
67
-* ds/bundle-uri (2022-05-16) 8 commits
68
- - bundle.h: make "fd" version of read_bundle_header() public
69
- - remote: allow relative_url() to return an absolute url
70
- - remote: move relative_url()
71
- - http: make http_get_file() external
72
- - fetch-pack: move --keep=* option filling to a function
73
- - fetch-pack: add a deref_without_lazy_fetch_extended()
74
- - dir API: add a generalized path_match_flags() function
75
- - connect.c: refactor sending of agent & object-format
65
+ macOS CI jobs have been occasionally flaky due to tentative version
66
+ skew between perforce and the homebrew packager. Instead of
67
+ failing the whole CI job, just let it skip the p4 tests when this
68
+ happens.
69
+ source: <20220512223940.238367-1-gitster@pobox.com>
70
77
- source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
71
72
+* cd/bisect-messages-from-pre-flight-states (2022-05-11) 2 commits
73
+ (merged to 'next' on 2022-05-12 at 0e6072fb45)
74
+ + bisect: output bisect setup status in bisect log
75
+ + bisect: output state before we are ready to compute bisection
76
80
-* ds/sparse-sparse-checkout (2022-05-16) 8 commits
81
- - sparse-checkout: integrate with sparse index
82
- - p2000: add test for 'git sparse-checkout [add|set]'
83
- - sparse-index: complete partial expansion
84
- - sparse-index: partially expand directories
85
- - sparse-checkout: --no-sparse-index needs a full index
86
- - cache-tree: implement cache_tree_find_path()
87
- - sparse-index: introduce partially-sparse indexes
88
- - sparse-index: create expand_to_pattern_list()
77
+ "git bisect" was too silent before it is ready to start computing
78
+ the actual bisection, which has been corrected.
79
+ source: <cover.1652291688.git.chris@chrisdown.name>
80
90
- "sparse-checkout" learns to work well with the sparse-index
81
+
82
+* cg/vscode-with-gdb (2022-04-08) 1 commit
83
+ (merged to 'next' on 2022-05-12 at 2635bf0c8c)
84
+ + contrib/vscode/: debugging with VS Code and gdb
85
+
86
+ VS code configuration updates.
87
+ source: <20220407204001.112287-2-cogoni.guillaume@gmail.com>
88
+
89
+
90
+* ds/do-not-call-bug-on-bad-refs (2022-04-25) 1 commit
91
+ (merged to 'next' on 2022-05-12 at af4d003dfb)
92
+ + clone: die() instead of BUG() on bad refs
93
+
94
+ Code clean-up.
95
+ source: <pull.1214.v2.git.1650894450441.gitgitgadget@gmail.com>
96
+
97
+
98
+* ds/sparse-colon-path (2022-04-26) 5 commits
99
+ (merged to 'next' on 2022-05-13 at f1740d248a)
100
+ + rev-parse: integrate with sparse index
101
+ + object-name: diagnose trees in index properly
102
+ + object-name: reject trees found in the index
103
+ + show: integrate with the sparse index
104
+ + t1092: add compatibility tests for 'git show'
105
+
106
+ "git show :<path>" learned to work better with the sparse-index
107
feature.
92
- source: <pull.1208.git.1652724693.gitgitgadget@gmail.com>
108
+ source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
109
110
95
-* gc/bare-repo-discovery (2022-05-16) 3 commits
96
- - SQUASH??? move new test to t0035
97
- - setup.c: learn discovery.bareRepository=cwd
98
- - setup.c: make bare repo discovery optional
111
+* ep/equals-null-cocci (2022-05-02) 2 commits
112
+ (merged to 'next' on 2022-05-13 at a8de51ce7a)
113
+ + tree-wide: apply equals-null.cocci
114
+ + Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
115
+ (this branch uses ep/maint-equals-null-cocci.)
116
100
- Introduce a discovery.barerepository configuration variable that
101
- allows users to forbid discovery of bare repositories.
117
+ Merges up ep/maint-equals-null-cocci to the current codebase.
118
103
- Expecting a reroll.
104
- source: <pull.1261.v2.git.git.1652485058.gitgitgadget@gmail.com>
119
120
+* ep/maint-equals-null-cocci (2022-05-02) 4 commits
121
+ (merged to 'next' on 2022-05-13 at 022e914848)
122
+ + tree-wide: apply equals-null.cocci
123
+ + Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
124
+ + tree-wide: apply equals-null.cocci
125
+ + contrib/coccinnelle: add equals-null.cocci
126
+ (this branch is used by ep/equals-null-cocci.)
127
107
-* jt/fetch-peek-optional-section (2022-05-16) 1 commit
108
- - fetch-pack: make unexpected peek result non-fatal
128
+ Introduce and apply coccinelle rule to discourage an explicit
129
+ comparison between a pointer and NULL, and applies the clean-up to
130
+ the maintenance track.
131
110
- "git fetch" unnecessarily failed when an unexpected optional
111
- section appeared in the output, which has been corrected.
132
113
- Will merge to 'next'.
114
- source: <20220516110221.3490982-1-jonathantanmy@google.com>
133
+* gc/pull-recurse-submodules (2022-05-11) 1 commit
134
+ (merged to 'next' on 2022-05-12 at fe15c34c7a)
135
+ + pull: do not let submodule.recurse override fetch.recurseSubmodules
136
+
137
+ "git pull" without "--recurse-submodules=<arg>" made
138
+ submodule.recurse take precedence over fetch.recurseSubmodules by
139
+ mistake, which has been corrected.
140
+ source: <pull.1262.v2.git.git.1652210747614.gitgitgadget@gmail.com>
141
142
117
-* os/fetch-check-not-current-branch (2022-05-16) 1 commit
118
- - fetch: limit shared symref check only for local branches
143
+* gf/shorthand-version-and-help (2022-03-31) 1 commit
144
+ (merged to 'next' on 2022-05-12 at 54ca8b25e0)
145
+ + cli: add -v and -h shorthands
146
120
- The way "git fetch" without "--update-head-ok" ensures that HEAD in
121
- no worktree points at any ref being updated was too wasteful, which
122
- has been optimized a bit.
147
+ "git -v" and "git -h" are now understood as "git --version" and
148
+ "git --help".
149
+ source: <20220331212709.36036-1-garrit@slashdev.space>
150
124
- Will merge to 'next'?
125
- source: <pull.1266.v2.git.git.1652690501963.gitgitgadget@gmail.com>
151
152
+* gf/unused-includes (2022-04-06) 2 commits
153
+ (merged to 'next' on 2022-05-12 at 690a2d8976)
154
+ + apply.c: remove unnecessary include
155
+ + serve.c: remove unnecessary include
156
128
-* ds/object-file-unpack-loose-header-fix (2022-05-16) 1 commit
129
- - object-file: convert 'switch' back to 'if'
130
- (this branch uses ab/valgrind-fixes.)
157
+ Remove unused includes.
158
+ source: <20220331194436.58005-1-garrit@slashdev.space>
159
132
- Coding style fix.
160
134
- Will merge to 'next'?
135
- source: <377be0e9-8a0f-4a86-0a66-3b08c0284dae@github.com>
161
+* jc/update-ozlabs-url (2022-05-11) 1 commit
162
+ (merged to 'next' on 2022-05-12 at d6b14040b6)
163
+ + SubmittingPatches: use more stable git.ozlabs.org URL
164
+
165
+ Update URL to the gitk repository.
166
+
167
+
168
+* js/trace2-doc-fixes (2022-05-04) 6 commits
169
+ (merged to 'next' on 2022-05-12 at b37c6a8c2e)
170
+ + trace2 docs: add missing full stop
171
+ + trace2 docs: clarify what `varargs` is all about
172
+ + trace2 docs: fix a JSON formatted example
173
+ + trace2 docs: surround more terms in backticks
174
+ + trace2 docs: "printf" is not an English word
175
+ + trace2 docs: a couple of grammar fixes
176
+
177
+ Trace2 documentation updates.
178
+ source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
179
+
180
+
181
+* kf/p4-multiple-remotes (2022-03-21) 1 commit
182
+ (merged to 'next' on 2022-05-12 at 447ed8ee3e)
183
+ + git-p4: fix issue with multiple perforce remotes
184
+
185
+ "git p4" update.
186
+ source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
187
+
188
+
189
+* km/t3501-use-test-helpers (2022-04-06) 1 commit
190
+ (merged to 'next' on 2022-05-12 at 66c5cd1c32)
191
+ + t3501: remove test -f and stop ignoring git <cmd> exit code
192
+
193
+ Test script updates.
194
+ source: <20220405134742.17526-2-khalid.masum.92@gmail.com>
195
+
196
+
197
+* mg/detect-compiler-in-c-locale (2022-05-09) 1 commit
198
+ (merged to 'next' on 2022-05-12 at 58c7d6e461)
199
+ + detect-compiler: make detection independent of locale
200
+
201
+ Build procedure fixup.
202
+ source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
203
+
204
+
205
+* mv/log-since-as-filter (2022-04-23) 1 commit
206
+ (merged to 'next' on 2022-05-12 at dc93e4e93a)
207
+ + log: "--since-as-filter" option is a non-terminating "--since" variant
208
+
209
+ "git log --since=X" will stop traversal upon seeing a commit that
210
+ is older than X, but there may be commits behind it that is younger
211
+ than X when the commit was created with a faulty clock. A new
212
+ option is added to keep digging without stopping, and instead
213
+ filter out commits with timestamp older than X.
214
+ source: <YmP4TaYmSEi6GeB4@vmiklos.hu>
215
+
216
+
217
+* pb/submodule-recurse-mode-enum (2022-04-06) 1 commit
218
+ (merged to 'next' on 2022-05-12 at 1164a4c9b7)
219
+ + submodule.h: use a named enum for RECURSE_SUBMODULES_*
220
+
221
+ Small code clean-up.
222
+ source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
223
+
224
+
225
+* rs/external-diff-tempfile (2022-04-20) 2 commits
226
+ (merged to 'next' on 2022-05-12 at b357b518b3)
227
+ + diff: use mks_tempfile_dt()
228
+ + tempfile: add mks_tempfile_dt()
229
+
230
+ The temporary files fed to external diff command are now generated
231
+ inside a new temporary directory under the same basename.
232
+ source: <2ad1dd80-e79f-7304-219c-db24bb269c4d@web.de>
233
+
234
+
235
+* rs/t7812-pcre2-ws-bug-test (2022-04-11) 1 commit
236
+ (merged to 'next' on 2022-05-12 at 0e0ce3b493)
237
+ + t7812: test PCRE2 whitespace bug
238
+
239
+ A test to ensure workaround for an earlier pcre2 bug does work.
240
+ source: <3a49649d-8ff9-e5a7-e3fd-33fee5068ae8@web.de>
241
+
242
+
243
+* sa/t1011-use-helpers (2022-04-12) 1 commit
244
+ (merged to 'next' on 2022-05-12 at 5bed8531e3)
245
+ + t1011: replace test -f with test_path_is_file
246
+
247
+ A GSoC practice.
248
+ source: <20220412203722.10484-1-siddharthasthana31@gmail.com>
249
+
250
+
251
+* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
252
+ (merged to 'next' on 2022-05-12 at 2a6a11d6bf)
253
+ + safe.directory: document and check that it's ignored in the environment
254
+ + t0033-safe-directory: check when 'safe.directory' is ignored
255
+ + t0033-safe-directory: check the error message without matching the trash dir
256
+
257
+ New tests for the safe.directory mechanism.
258
+ source: <20220427170649.4949-1-szeder.dev@gmail.com>
259
+
260
+
261
+* tk/p4-metadata-coding-strategies (2022-05-04) 1 commit
262
+ (merged to 'next' on 2022-05-13 at d083cc3ff0)
263
+ + git-p4: improve encoding handling to support inconsistent encodings
264
+
265
+ "git p4" updates.
266
+ source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
267
+
268
+
269
+* tk/p4-utf8-bom (2022-04-06) 1 commit
270
+ (merged to 'next' on 2022-05-12 at 7bb2e70e7b)
271
+ + git-p4: preserve utf8 BOM when importing from p4 to git
272
+
273
+ "git p4" update.
274
+ source: <pull.1203.git.1649051436934.gitgitgadget@gmail.com>
275
+
276
+
277
+* tk/p4-with-explicity-sync (2022-04-06) 1 commit
278
+ (merged to 'next' on 2022-05-12 at 81e662edae)
279
+ + git-p4: support explicit sync of arbitrary existing git-p4 refs
280
+
281
+ "git p4" update.
282
+ source: <pull.1202.git.1649049054600.gitgitgadget@gmail.com>
283
+
284
+
285
+* vd/sparse-stash (2022-05-10) 6 commits
286
+ (merged to 'next' on 2022-05-13 at 0f52519a0e)
287
+ + unpack-trees: preserve index sparsity
288
+ + stash: apply stash using 'merge_ort_nonrecursive()'
289
+ + read-cache: set sparsity when index is new
290
+ + sparse-index: expose 'is_sparse_index_allowed()'
291
+ + stash: integrate with sparse index
292
+ + stash: expand sparse-checkout compatibility testing
293
+
294
+ Teach "git stash" to work better with sparse index entries.
295
+ source: <pull.1171.v3.git.1652225552.gitgitgadget@gmail.com>
296
+
297
+--------------------------------------------------
298
+[New Topics]
299
+
300
+* jc/avoid-redundant-submodule-fetch (2022-05-18) 1 commit
301
+ (merged to 'next' on 2022-05-19 at 11dabe678b)
302
+ + fetch: do not run a redundant fetch from submodule
303
+
304
+ "git fetch --recurse-submodules" from multiple remotes (either from
305
+ a remote group, or "--all") used to make one extra "git fetch" in
306
+ the submodules, which has been corrected.
307
+
308
+ Will merge to 'master'.
309
+ source: <xmqqk0alyqyj.fsf_-_@gitster.g>
310
+
311
+
312
+* tb/receive-pack-code-cleanup (2022-05-18) 1 commit
313
+ (merged to 'next' on 2022-05-19 at 756d64f5a2)
314
+ + builtin/receive-pack.c: remove redundant 'if'
315
+
316
+ Code clean-up.
317
+
318
+ Will merge to 'master'.
319
+ source: <d22f2ca975778d594449857d64be8cd8c0d4a327.1652905549.git.me@ttaylorr.com>
320
+
321
+
322
+* cb/path-owner-check-with-sudo-plus (2022-05-12) 1 commit
323
+ - git-compat-util: allow root to access both SUDO_UID and root owned
324
+ (this branch uses cb/path-owner-check-with-sudo.)
325
+
326
+ "sudo git foo" used to consider a repository owned by the original
327
+ user a safe one to access; it now also considers a repository owned
328
+ by root a safe one, too (after all, if an attacker can craft a
329
+ malicious repository owned by root, the box is 0wned already).
330
+ source: <20220513010020.55361-1-carenas@gmail.com>
331
+
332
+
333
+* jc/t6424-failing-merge-preserve-local-changes (2022-05-19) 1 commit
334
+ - t6424: make sure a failed merge preserves local changes
335
+
336
+ The tests that ensured merges stop when interfering local changes
337
+ are present did not make sure that local changes are preserved; now
338
+ they do.
339
+
340
+ Will merge to 'next'.
341
+ source: <xmqqbkvtnyae.fsf@gitster.g>
342
+
343
+
344
+* tb/geom-repack-with-keep-and-max (2022-05-20) 3 commits
345
+ - builtin/repack.c: ensure that `names` is sorted
346
+ - t7703: demonstrate object corruption with pack.packSizeLimit
347
+ - repack: respect --keep-pack with geometric repack
348
+
349
+ source: <cover.1653073280.git.me@ttaylorr.com>
350
351
--------------------------------------------------
352
[Stalled]
@@ -155,7 +369,7 @@ Release tarballs are available at:
369
370
Final bits of "git bisect.sh" have been rewritten in C.
371
158
- Expecting a reroll.
372
+ Will discard, as it has been stalled for way too long.
373
cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>
374
source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
375
@@ -166,7 +380,7 @@ Release tarballs are available at:
380
Insert a layer of preprocessor macros for common functions in xdiff
381
codebase.
382
169
- Expecting a reroll.
383
+ Will discard, as it has been stalled for way too long.
384
cf. <xmqqbkyudb8n.fsf@gitster.g>
385
source: <20220217225408.GB7@edef91d97c94>
386
@@ -204,23 +418,6 @@ Release tarballs are available at:
418
source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
419
420
207
-* ab/hooks-regression-fix (2022-04-21) 6 commits
208
- - hook API: fix v2.36.0 regression: hooks should be connected to a TTY
209
- - hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
210
- - hook tests: fix redirection logic error in 96e7225b310
211
- - run-command: add an "ungroup" option to run_process_parallel()
212
- - run-command tests: test stdout of run_command_parallel()
213
- - run-command API: replace run_processes_parallel_tr2() with opts struct
214
-
215
- In Git 2.36 we revamped the way how hooks are invoked. One change
216
- that is end-user visible is that the output of a hook is no longer
217
- directly connected to the standard output of "git" that spawns the
218
- hook, which was noticed post release. This is getting corrected.
219
-
220
- Expecting a reroll.
221
- source: <cover-0.6-00000000000-20220421T122108Z-avarab@gmail.com>
222
-
223
-
421
* js/wait-or-whine-can-fail (2022-04-28) 1 commit
422
- run-command: don't spam trace2_child_exit()
423
@@ -238,7 +435,7 @@ Release tarballs are available at:
435
rebase.abbreviateCommands; we failed to recognize that we were in a
436
multi-step cherry-pick session.
437
241
- Is this even needed? How?
438
+ Will discard, as it has been stalled for way too long.
439
cf. <xmqqwngdzque.fsf@gitster.g>
440
source: <20220325145301.3370-1-danny0838@gmail.com>
441
@@ -251,7 +448,7 @@ Release tarballs are available at:
448
A configuration variable in a repository tells if it is (or is not)
449
a submodule of a superproject.
450
254
- Expecting a reroll.
451
+ Will discard, as it has been stalled for way too long.
452
cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
453
source: <20220310004423.2627181-1-emilyshaffer@google.com>
454
@@ -277,465 +474,316 @@ Release tarballs are available at:
474
--------------------------------------------------
475
[Cooking]
476
280
-* gg/worktree-from-the-above (2022-05-11) 2 commits
281
- - dir: minor refactoring / clean-up
282
- - dir: consider worktree config in path recursion
283
-
284
- With a non-bare repository, with core.worktree pointing at a
285
- directory that has the repository as its subdirectory, regressed in
286
- Git 2.27 days.
287
-
288
- Expecting a reroll.
289
- source: <20220510171527.25778-1-ggossdev@gmail.com>
290
-
291
-
292
-* jc/update-ozlabs-url (2022-05-11) 1 commit
293
- (merged to 'next' on 2022-05-12 at d6b14040b6)
294
- + SubmittingPatches: use more stable git.ozlabs.org URL
295
-
296
- Will merge to 'master'.
297
-
298
-
299
-* jc/archive-add-file-normalize-mode (2022-05-12) 1 commit
300
- (merged to 'next' on 2022-05-16 at 265bb02f2a)
301
- + archive: do not let on-disk mode leak to zip archives
302
-
303
- "git archive --add-file=<path>" picked up the raw permission bits
304
- from the path and propagated to zip output in some cases, without
305
- normalization, which has been corrected (tar output did not have
306
- this issue).
307
-
308
- Will merge to 'master'.
309
- source: <xmqqmtfme8v6.fsf@gitster.g>
310
-
311
-
312
-* ab/commit-plug-leaks (2022-05-12) 1 commit
313
- (merged to 'next' on 2022-05-16 at 00bcda44af)
314
- + commit: fix "author_ident" leak
315
-
316
- Leakfix in the top-level called-once function.
317
-
318
- Will merge to 'master'.
319
- source: <xmqqzgjmcqlg.fsf@gitster.g>
320
-
321
-
322
-* ab/valgrind-fixes (2022-05-12) 4 commits
323
- (merged to 'next' on 2022-05-16 at 75d760528f)
324
- + commit-graph.c: don't assume that stat() succeeds
325
- + object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
326
- + log test: skip a failing mkstemp() test under valgrind
327
- + tests: using custom GIT_EXEC_PATH breaks --valgrind tests
328
- (this branch is used by ds/object-file-unpack-loose-header-fix.)
329
-
330
- A bit of test framework fixes with a few fixes to issues found by
331
- valgrind.
332
-
333
- Will merge to 'master'.
334
- source: <20220512223218.237544-1-gitster@pobox.com>
335
-
336
-
337
-* cd/bisect-messages-from-pre-flight-states (2022-05-11) 2 commits
338
- (merged to 'next' on 2022-05-12 at 0e6072fb45)
339
- + bisect: output bisect setup status in bisect log
340
- + bisect: output state before we are ready to compute bisection
341
-
342
- "git bisect" was too silent before it is ready to start computing
343
- the actual bisection, which has been corrected.
344
-
345
- Will merge to 'master'.
346
- source: <cover.1652291688.git.chris@chrisdown.name>
347
-
348
-
349
-* mg/detect-compiler-in-c-locale (2022-05-09) 1 commit
350
- (merged to 'next' on 2022-05-12 at 58c7d6e461)
351
- + detect-compiler: make detection independent of locale
352
-
353
- Build procedure fixup.
354
-
355
- Will merge to 'master'.
356
- source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
357
-
358
-
359
-* gc/pull-recurse-submodules (2022-05-11) 1 commit
360
- (merged to 'next' on 2022-05-12 at fe15c34c7a)
361
- + pull: do not let submodule.recurse override fetch.recurseSubmodules
362
-
363
- "git pull" without "--recurse-submodules=<arg>" made
364
- submodule.recurse take precedence over fetch.recurseSubmodules by
365
- mistake, which has been corrected.
366
-
367
- Will merge to 'master'.
368
- source: <pull.1262.v2.git.git.1652210747614.gitgitgadget@gmail.com>
369
-
370
-
371
-* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
372
- - builtin/remote.c: teach `-v` to list filters for promisor remotes
373
-
374
- "git remote -v" now shows the list-objects-filter used during
375
- fetching from the remote, if available.
376
-
377
- Will merge to 'next'?
378
- source: <pull.1227.v4.git.1652095969026.gitgitgadget@gmail.com>
379
-
380
-
381
-* cc/http-curlopt-resolve (2022-05-16) 1 commit
382
- - http: add custom hostname to IP address resolutions
383
-
384
- With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
385
- mechanism that allows cURL based applications to use pre-resolved
386
- IP addresses for the requests is exposed to the scripts.
387
-
388
- Will merge to 'next'?
389
- source: <20220516083851.202057-1-chriscool@tuxfamily.org>
390
-
391
-
392
-* js/trace2-doc-fixes (2022-05-04) 6 commits
393
- (merged to 'next' on 2022-05-12 at b37c6a8c2e)
394
- + trace2 docs: add missing full stop
395
- + trace2 docs: clarify what `varargs` is all about
396
- + trace2 docs: fix a JSON formatted example
397
- + trace2 docs: surround more terms in backticks
398
- + trace2 docs: "printf" is not an English word
399
- + trace2 docs: a couple of grammar fixes
400
-
401
- Trace2 documentation updates.
402
-
403
- Will merge to 'master'.
404
- source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
405
-
406
-
407
-* jx/l10n-workflow-change (2022-05-04) 9 commits
408
- - l10n: Document the new l10n workflow
409
- - Makefile: add "po-init" rule to initialize po/XX.po
410
- - Makefile: add "po-update" rule to update po/XX.po
411
- - po/git.pot: don't check in result of "make pot"
412
- - po/git.pot: this is now a generated file
413
- - i18n CI: stop allowing non-ASCII source messages in po/git.pot
414
- - Makefile: have "make pot" not "reset --hard"
415
- - Makefile: generate "po/git.pot" from stable LOCALIZED_C
416
- - Makefile: sort "po/git.pot" by file location
417
-
418
- A workflow change for translators are being proposed.
419
-
420
- cf. <YnRI6u+dV5GNHoD9@acer>
421
- source: <20220503132354.9567-1-worldhello.net@gmail.com>
422
-
423
-
424
-* tk/p4-metadata-coding-strategies (2022-05-04) 1 commit
425
- (merged to 'next' on 2022-05-13 at d083cc3ff0)
426
- + git-p4: improve encoding handling to support inconsistent encodings
427
-
428
- "git p4" updates.
429
-
430
- Will merge to 'master'.
431
- source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
432
-
433
-
434
-* ep/equals-null-cocci (2022-05-02) 2 commits
435
- (merged to 'next' on 2022-05-13 at a8de51ce7a)
436
- + tree-wide: apply equals-null.cocci
437
- + Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
438
- (this branch uses ep/maint-equals-null-cocci.)
439
-
440
- Merges up ep/maint-equals-null-cocci to the current codebase.
441
-
442
- Will merge to 'master'.
443
-
444
-
445
-* ep/maint-equals-null-cocci (2022-05-02) 4 commits
446
- (merged to 'next' on 2022-05-13 at 022e914848)
447
- + tree-wide: apply equals-null.cocci
448
- + Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
449
- + tree-wide: apply equals-null.cocci
450
- + contrib/coccinnelle: add equals-null.cocci
451
- (this branch is used by ep/equals-null-cocci.)
452
-
453
- Introduce and apply coccinelle rule to discourage an explicit
454
- comparison between a pointer and NULL, and applies the clean-up to
455
- the maintenance track.
456
-
457
- Will merge to 'master'.
458
-
459
-
460
-* ds/sparse-colon-path (2022-04-26) 5 commits
461
- (merged to 'next' on 2022-05-13 at f1740d248a)
462
- + rev-parse: integrate with sparse index
463
- + object-name: diagnose trees in index properly
464
- + object-name: reject trees found in the index
465
- + show: integrate with the sparse index
466
- + t1092: add compatibility tests for 'git show'
467
-
468
- "git show :<path>" learned to work better with the sparse-index
469
- feature.
470
-
471
- Will merge to 'master'.
472
- source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
473
-
477
+* ab/hooks-regression-fix (2022-05-18) 8 commits
478
+ - hook API: fix v2.36.0 regression: hooks should be connected to a TTY
479
+ - hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
480
+ - hook tests: fix redirection logic error in 96e7225b310
481
+ - run-command: add an "ungroup" option to run_process_parallel()
482
+ - run-command.c: add an initializer for "struct parallel_processes"
483
+ - run-command tests: test stdout of run_command_parallel()
484
+ - run-command API: use "opts" struct for run_processes_parallel{,_tr2}()
485
+ - run-command tests: change if/if/... to if/else if/else
486
475
-* cb/path-owner-check-with-sudo (2022-05-12) 4 commits
476
- - git-compat-util: allow root to access both SUDO_UID and root owned
477
- - t0034: add negative tests and allow git init to mostly work under sudo
478
- - git-compat-util: avoid failing dir ownership checks if running privileged
479
- - t: regression git needs safe.directory when using sudo
487
+ In Git 2.36 we revamped the way how hooks are invoked. One change
488
+ that is end-user visible is that the output of a hook is no longer
489
+ directly connected to the standard output of "git" that spawns the
490
+ hook, which was noticed post release. This is getting corrected.
491
+ source: <cover-v2-0.8-00000000000-20220518T195858Z-avarab@gmail.com>
492
481
- With a recent update to refuse access to repositories of other
482
- people by default, "sudo make install" and "sudo git describe"
483
- stopped working. This series intends to loosen it while keeping
484
- the safety.
493
486
- Will merge to 'next'?
487
- source: <20220513010020.55361-1-carenas@gmail.com>
494
+* tb/midx-race-in-pack-objects (2022-05-13) 2 commits
495
+ - builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
496
+ - pack-bitmap: check preferred pack validity when opening MIDX bitmap
497
498
+ The multi-pack-index code did not protect the packfile it is going
499
+ to depend on from getting removed while in use, which has been
500
+ corrected.
501
490
-* pb/ggg-in-mfc-doc (2022-05-12) 5 commits
491
- - MyFirstContribution: drop PR description for GGG single-patch contributions
492
- - MyFirstContribution: reference "The cover letter" in GitGitGadget section
493
- - MyFirstContribution: reference "The cover letter" in "Preparing Email"
494
- - MyFirstContribution: add standalone section on cover letter
495
- - MyFirstContribution: add "Anatomy of a Patch Series" section
502
+ Expecting a reroll.
503
+ cf. <Yn63nDhSBIEa3/+/@nand.local>
504
+ cf. <Yn+v8mEHm2sfo4sn@nand.local>
505
+ source: <cover.1652458395.git.me@ttaylorr.com>
506
497
- Documentation update.
507
499
- Will merge to 'next'?
500
- source: <pull.1226.v3.git.1652399017.gitgitgadget@gmail.com>
508
+* ds/bundle-uri (2022-05-20) 32 commits
509
+ - t5601: basic bundle URI tests
510
+ - clone: unbundle the advertised bundles
511
+ - bundle-uri: download bundles from an advertised list
512
+ - bundle-uri: allow relative URLs in bundle lists
513
+ - bundle-uri client: add boolean transfer.bundleURI setting
514
+ - bundle-uri: serve URI advertisement from bundle.* config
515
+ - bundle-uri client: add "git ls-remote-bundle-uri"
516
+ - bundle-uri client: add minimal NOOP client
517
+ - protocol v2: add server-side "bundle-uri" skeleton
518
+ - bundle-uri: fetch a list of bundles
519
+ - bundle-uri: parse bundle list in config format
520
+ - bundle-uri: limit recursion depth for bundle lists
521
+ - bundle-uri: unit test "key=value" parsing
522
+ - bundle-uri: create "key=value" line parsing
523
+ - bundle-uri: create base key-value pair parsing
524
+ - bundle-uri: create bundle_list struct and helpers
525
+ - clone: --bundle-uri cannot be combined with --depth
526
+ - clone: add --bundle-uri option
527
+ - fetch: add 'refs/bundle/' to log.excludeDecoration
528
+ - fetch: add --bundle-uri option
529
+ - bundle-uri: add support for http(s):// and file://
530
+ - bundle-uri: create basic file-copy logic
531
+ - remote-curl: add 'get' capability
532
+ - docs: document bundle URI standard
533
+ - bundle.h: make "fd" version of read_bundle_header() public
534
+ - remote: allow relative_url() to return an absolute url
535
+ - remote: move relative_url()
536
+ - http: make http_get_file() external
537
+ - fetch-pack: move --keep=* option filling to a function
538
+ - fetch-pack: add a deref_without_lazy_fetch_extended()
539
+ - dir API: add a generalized path_match_flags() function
540
+ - connect.c: refactor sending of agent & object-format
541
542
+ source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
543
+ source: <pull.1234.git.1653072042.gitgitgadget@gmail.com>
544
503
-* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
504
- (merged to 'next' on 2022-05-12 at 2a6a11d6bf)
505
- + safe.directory: document and check that it's ignored in the environment
506
- + t0033-safe-directory: check when 'safe.directory' is ignored
507
- + t0033-safe-directory: check the error message without matching the trash dir
545
509
- New tests for the safe.directory mechanism.
546
+* ds/sparse-sparse-checkout (2022-05-19) 10 commits
547
+ - sparse-checkout: integrate with sparse index
548
+ - p2000: add test for 'git sparse-checkout [add|set]'
549
+ - sparse-index: complete partial expansion
550
+ - sparse-index: partially expand directories
551
+ - sparse-checkout: --no-sparse-index needs a full index
552
+ - cache-tree: implement cache_tree_find_path()
553
+ - sparse-index: introduce partially-sparse indexes
554
+ - sparse-index: create expand_to_pattern_list()
555
+ - t1092: stress test 'git sparse-checkout set'
556
+ - t1092: refactor 'sparse-index contents' test
557
511
- Will merge to 'master'.
512
- source: <20220427170649.4949-1-szeder.dev@gmail.com>
558
+ "sparse-checkout" learns to work well with the sparse-index
559
+ feature.
560
+ source: <pull.1208.v2.git.1652982758.gitgitgadget@gmail.com>
561
562
515
-* cg/tools-for-git-doc (2022-04-21) 1 commit
516
- - Documentation/ToolsForGit.txt: Tools for developing Git
563
+* gc/bare-repo-discovery (2022-05-16) 3 commits
564
+ - SQUASH??? move new test to t0035
565
+ - setup.c: learn discovery.bareRepository=cwd
566
+ - setup.c: make bare repo discovery optional
567
518
- A new doc that lists tips for tools to work with Git's codebase.
568
+ Introduce a discovery.barerepository configuration variable that
569
+ allows users to forbid discovery of bare repositories.
570
520
- Will merge to 'next'?
521
- source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
571
+ Expecting a reroll.
572
+ source: <pull.1261.v2.git.git.1652485058.gitgitgadget@gmail.com>
573
574
524
-* cb/ci-make-p4-optional (2022-05-12) 4 commits
525
- (merged to 'next' on 2022-05-13 at 7e84679e2a)
526
- + ci: use https, not http to download binaries from perforce.com
527
- + ci: reintroduce prevention from perforce being quarantined in macOS
528
- + ci: avoid brew for installing perforce
529
- + ci: make failure to find perforce more user friendly
575
+* jt/fetch-peek-optional-section (2022-05-16) 1 commit
576
+ (merged to 'next' on 2022-05-18 at bc876bd2cf)
577
+ + fetch-pack: make unexpected peek result non-fatal
578
531
- macOS CI jobs have been occasionally flaky due to tentative version
532
- skew between perforce and the homebrew packager. Instead of
533
- failing the whole CI job, just let it skip the p4 tests when this
534
- happens.
579
+ "git fetch" unnecessarily failed when an unexpected optional
580
+ section appeared in the output, which has been corrected.
581
582
Will merge to 'master'.
537
- source: <20220512223940.238367-1-gitster@pobox.com>
538
-
539
-
540
-* jc/show-branch-g-current (2022-04-21) 1 commit
541
- - show-branch: -g and --current are incompatible
583
+ source: <20220516110221.3490982-1-jonathantanmy@google.com>
584
543
- The "--current" option of "git show-branch" should have been made
544
- incompatible with the "--reflog" mode, but this was not enforced,
545
- which has been corrected.
585
547
- Will merge to 'next'.
548
- source: <xmqqh76mf7s4.fsf_-_@gitster.g>
586
+* os/fetch-check-not-current-branch (2022-05-16) 1 commit
587
+ (merged to 'next' on 2022-05-19 at f48dca6322)
588
+ + fetch: limit shared symref check only for local branches
589
590
+ The way "git fetch" without "--update-head-ok" ensures that HEAD in
591
+ no worktree points at any ref being updated was too wasteful, which
592
+ has been optimized a bit.
593
551
-* rs/external-diff-tempfile (2022-04-20) 2 commits
552
- (merged to 'next' on 2022-05-12 at b357b518b3)
553
- + diff: use mks_tempfile_dt()
554
- + tempfile: add mks_tempfile_dt()
594
+ Will merge to 'master'.
595
+ source: <pull.1266.v2.git.git.1652690501963.gitgitgadget@gmail.com>
596
556
- The temporary files fed to external diff command are now generated
557
- inside a new temporary directory under the same basename.
597
559
- Will merge to 'master'.
560
- source: <2ad1dd80-e79f-7304-219c-db24bb269c4d@web.de>
598
+* ds/object-file-unpack-loose-header-fix (2022-05-16) 1 commit
599
+ - object-file: convert 'switch' back to 'if'
600
+ (this branch uses ab/valgrind-fixes.)
601
602
+ Coding style fix.
603
563
-* ar/send-email-confirm-by-default (2022-04-22) 1 commit
564
- - send-email: always confirm by default
604
+ Will merge to 'next'.
605
+ source: <377be0e9-8a0f-4a86-0a66-3b08c0284dae@github.com>
606
566
- "git send-email" is changed so that by default it asks for
567
- confirmation before sending each message out.
607
569
- Will discard.
608
+* gg/worktree-from-the-above (2022-05-20) 3 commits
609
+ - dir: minor refactoring / clean-up
610
+ - dir: cache git_dir's realpath
611
+ - dir: traverse into repository
612
571
- I wanted to like this, and had it in the version of Git I use
572
- myself for daily work, but the prompting turned out to be somewhat
573
- distracting.
613
+ With a non-bare repository, with core.worktree pointing at a
614
+ directory that has the repository as its subdirectory, regressed in
615
+ Git 2.27 days.
616
575
- Thoughts?
576
- source: <20220422083629.1404989-1-hi@alyssa.is>
617
+ Needs review.
618
+ source: <20220520192840.8942-1-ggossdev@gmail.com>
619
620
579
-* mv/log-since-as-filter (2022-04-23) 1 commit
580
- (merged to 'next' on 2022-05-12 at dc93e4e93a)
581
- + log: "--since-as-filter" option is a non-terminating "--since" variant
621
+* jc/archive-add-file-normalize-mode (2022-05-12) 1 commit
622
+ (merged to 'next' on 2022-05-16 at 265bb02f2a)
623
+ + archive: do not let on-disk mode leak to zip archives
624
583
- "git log --since=X" will stop traversal upon seeing a commit that
584
- is older than X, but there may be commits behind it that is younger
585
- than X when the commit was created with a faulty clock. A new
586
- option is added to keep digging without stopping, and instead
587
- filter out commits with timestamp older than X.
625
+ "git archive --add-file=<path>" picked up the raw permission bits
626
+ from the path and propagated to zip output in some cases, without
627
+ normalization, which has been corrected (tar output did not have
628
+ this issue).
629
630
Will merge to 'master'.
590
- source: <YmP4TaYmSEi6GeB4@vmiklos.hu>
631
+ source: <xmqqmtfme8v6.fsf@gitster.g>
632
633
593
-* ds/do-not-call-bug-on-bad-refs (2022-04-25) 1 commit
594
- (merged to 'next' on 2022-05-12 at af4d003dfb)
595
- + clone: die() instead of BUG() on bad refs
634
+* ab/commit-plug-leaks (2022-05-12) 1 commit
635
+ (merged to 'next' on 2022-05-16 at 00bcda44af)
636
+ + commit: fix "author_ident" leak
637
597
- Code clean-up.
638
+ Leakfix in the top-level called-once function.
639
640
Will merge to 'master'.
600
- source: <pull.1214.v2.git.1650894450441.gitgitgadget@gmail.com>
641
+ source: <xmqqzgjmcqlg.fsf@gitster.g>
642
643
603
-* vd/sparse-stash (2022-05-10) 6 commits
604
- (merged to 'next' on 2022-05-13 at 0f52519a0e)
605
- + unpack-trees: preserve index sparsity
606
- + stash: apply stash using 'merge_ort_nonrecursive()'
607
- + read-cache: set sparsity when index is new
608
- + sparse-index: expose 'is_sparse_index_allowed()'
609
- + stash: integrate with sparse index
610
- + stash: expand sparse-checkout compatibility testing
644
+* ab/valgrind-fixes (2022-05-12) 4 commits
645
+ (merged to 'next' on 2022-05-16 at 75d760528f)
646
+ + commit-graph.c: don't assume that stat() succeeds
647
+ + object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
648
+ + log test: skip a failing mkstemp() test under valgrind
649
+ + tests: using custom GIT_EXEC_PATH breaks --valgrind tests
650
+ (this branch is used by ds/object-file-unpack-loose-header-fix.)
651
612
- Teach "git stash" to work better with sparse index entries.
652
+ A bit of test framework fixes with a few fixes to issues found by
653
+ valgrind.
654
655
Will merge to 'master'.
615
- source: <pull.1171.v3.git.1652225552.gitgitgadget@gmail.com>
656
+ source: <20220512223218.237544-1-gitster@pobox.com>
657
658
618
-* sa/t1011-use-helpers (2022-04-12) 1 commit
619
- (merged to 'next' on 2022-05-12 at 5bed8531e3)
620
- + t1011: replace test -f with test_path_is_file
659
+* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
660
+ (merged to 'next' on 2022-05-20 at 8d2dc10d8f)
661
+ + builtin/remote.c: teach `-v` to list filters for promisor remotes
662
622
- A GSoC practice.
663
+ "git remote -v" now shows the list-objects-filter used during
664
+ fetching from the remote, if available.
665
666
Will merge to 'master'.
625
- source: <20220412203722.10484-1-siddharthasthana31@gmail.com>
626
-
667
+ source: <pull.1227.v4.git.1652095969026.gitgitgadget@gmail.com>
668
628
-* ep/coverage-report-wants-test-to-have-run (2022-04-13) 1 commit
629
- - Makefile: add a prerequisite to the coverage-report target
669
631
- "make coverage-report" without first running "make coverage" did
632
- not produce any meaningful result, which has been corrected.
670
+* cc/http-curlopt-resolve (2022-05-16) 1 commit
671
+ (merged to 'next' on 2022-05-20 at 80a07dc7de)
672
+ + http: add custom hostname to IP address resolutions
673
634
- Will merge to 'next'.
635
- source: <20220414022513.31465-1-gitter.spiros@gmail.com>
674
+ With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
675
+ mechanism that allows cURL based applications to use pre-resolved
676
+ IP addresses for the requests is exposed to the scripts.
677
678
+ Will merge to 'master'.
679
+ source: <20220516083851.202057-1-chriscool@tuxfamily.org>
680
638
-* rs/t7812-pcre2-ws-bug-test (2022-04-11) 1 commit
639
- (merged to 'next' on 2022-05-12 at 0e0ce3b493)
640
- + t7812: test PCRE2 whitespace bug
681
642
- A test to ensure workaround for an earlier pcre2 bug does work.
682
+* jx/l10n-workflow-change (2022-05-19) 9 commits
683
+ - l10n: Document the new l10n workflow
684
+ - Makefile: add "po-init" rule to initialize po/XX.po
685
+ - Makefile: add "po-update" rule to update po/XX.po
686
+ - po/git.pot: don't check in result of "make pot"
687
+ - po/git.pot: this is now a generated file
688
+ - i18n CI: stop allowing non-ASCII source messages in po/git.pot
689
+ - Makefile: have "make pot" not "reset --hard"
690
+ - Makefile: generate "po/git.pot" from stable LOCALIZED_C
691
+ - Makefile: sort "po/git.pot" by file location
692
644
- Will merge to 'master'.
645
- source: <3a49649d-8ff9-e5a7-e3fd-33fee5068ae8@web.de>
693
+ A workflow change for translators are being proposed.
694
+ source: <20220503132354.9567-1-worldhello.net@gmail.com>
695
696
648
-* ah/convert-warning-message (2022-04-08) 1 commit
649
- (merged to 'next' on 2022-05-12 at a9f8f32904)
650
- + convert: clarify line ending conversion warning
697
+* cb/path-owner-check-with-sudo (2022-05-12) 3 commits
698
+ (merged to 'next' on 2022-05-19 at d282e56560)
699
+ + t0034: add negative tests and allow git init to mostly work under sudo
700
+ + git-compat-util: avoid failing dir ownership checks if running privileged
701
+ + t: regression git needs safe.directory when using sudo
702
+ (this branch is used by cb/path-owner-check-with-sudo-plus.)
703
652
- Update a few end-user facing messages around eol conversion.
704
+ With a recent update to refuse access to repositories of other
705
+ people by default, "sudo make install" and "sudo git describe"
706
+ stopped working. This series intends to loosen it while keeping
707
+ the safety.
708
709
Will merge to 'master'.
655
- source: <20220408044154.9947-1-alexhenrie24@gmail.com>
710
+ source: <20220513010020.55361-1-carenas@gmail.com>
711
712
658
-* cg/vscode-with-gdb (2022-04-08) 1 commit
659
- (merged to 'next' on 2022-05-12 at 2635bf0c8c)
660
- + contrib/vscode/: debugging with VS Code and gdb
713
+* pb/ggg-in-mfc-doc (2022-05-12) 5 commits
714
+ (merged to 'next' on 2022-05-19 at e1c148492f)
715
+ + MyFirstContribution: drop PR description for GGG single-patch contributions
716
+ + MyFirstContribution: reference "The cover letter" in GitGitGadget section
717
+ + MyFirstContribution: reference "The cover letter" in "Preparing Email"
718
+ + MyFirstContribution: add standalone section on cover letter
719
+ + MyFirstContribution: add "Anatomy of a Patch Series" section
720
662
- VS code configuration updates.
721
+ Documentation update.
722
723
Will merge to 'master'.
665
- source: <20220407204001.112287-2-cogoni.guillaume@gmail.com>
724
+ source: <pull.1226.v3.git.1652399017.gitgitgadget@gmail.com>
725
726
668
-* gf/unused-includes (2022-04-06) 2 commits
669
- (merged to 'next' on 2022-05-12 at 690a2d8976)
670
- + apply.c: remove unnecessary include
671
- + serve.c: remove unnecessary include
727
+* cg/tools-for-git-doc (2022-04-21) 1 commit
728
+ (merged to 'next' on 2022-05-19 at e6b6309afb)
729
+ + Documentation/ToolsForGit.txt: Tools for developing Git
730
673
- Remove unused includes.
731
+ A new doc that lists tips for tools to work with Git's codebase.
732
733
Will merge to 'master'.
676
- source: <20220331194436.58005-1-garrit@slashdev.space>
734
+ source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
735
736
679
-* km/t3501-use-test-helpers (2022-04-06) 1 commit
680
- (merged to 'next' on 2022-05-12 at 66c5cd1c32)
681
- + t3501: remove test -f and stop ignoring git <cmd> exit code
737
+* jc/show-branch-g-current (2022-04-21) 1 commit
738
+ (merged to 'next' on 2022-05-18 at 870a1a1a71)
739
+ + show-branch: -g and --current are incompatible
740
683
- Test script updates.
741
+ The "--current" option of "git show-branch" should have been made
742
+ incompatible with the "--reflog" mode, but this was not enforced,
743
+ which has been corrected.
744
745
Will merge to 'master'.
686
- source: <20220405134742.17526-2-khalid.masum.92@gmail.com>
687
-
688
-
689
-* pb/submodule-recurse-mode-enum (2022-04-06) 1 commit
690
- (merged to 'next' on 2022-05-12 at 1164a4c9b7)
691
- + submodule.h: use a named enum for RECURSE_SUBMODULES_*
746
+ source: <xmqqh76mf7s4.fsf_-_@gitster.g>
747
693
- Small code clean-up.
748
695
- Will merge to 'master'.
696
- source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
749
+* ar/send-email-confirm-by-default (2022-04-22) 1 commit
750
+ - send-email: always confirm by default
751
752
+ "git send-email" is changed so that by default it asks for
753
+ confirmation before sending each message out.
754
699
-* tk/p4-utf8-bom (2022-04-06) 1 commit
700
- (merged to 'next' on 2022-05-12 at 7bb2e70e7b)
701
- + git-p4: preserve utf8 BOM when importing from p4 to git
755
+ Will discard.
756
703
- "git p4" update.
757
+ I wanted to like this, and had it in the version of Git I use
758
+ myself for daily work, but the prompting turned out to be somewhat
759
+ distracting.
760
705
- Will merge to 'master'.
706
- source: <pull.1203.git.1649051436934.gitgitgadget@gmail.com>
761
+ Thoughts?
762
+ source: <20220422083629.1404989-1-hi@alyssa.is>
763
764
709
-* tk/p4-with-explicity-sync (2022-04-06) 1 commit
710
- (merged to 'next' on 2022-05-12 at 81e662edae)
711
- + git-p4: support explicit sync of arbitrary existing git-p4 refs
765
+* ep/coverage-report-wants-test-to-have-run (2022-04-13) 1 commit
766
+ (merged to 'next' on 2022-05-18 at e4a51b0867)
767
+ + Makefile: add a prerequisite to the coverage-report target
768
713
- "git p4" update.
769
+ "make coverage-report" without first running "make coverage" did
770
+ not produce any meaningful result, which has been corrected.
771
772
Will merge to 'master'.
716
- source: <pull.1202.git.1649049054600.gitgitgadget@gmail.com>
773
+ source: <20220414022513.31465-1-gitter.spiros@gmail.com>
774
775
719
-* ab/env-array (2022-04-06) 3 commits
776
+* ab/env-array (2022-05-20) 4 commits
777
- run-command API users: use "env" not "env_array" in comments & names
778
+ - cocci: remove env_array -> env migration
779
- run-command API: rename "env_array" to "env"
780
- cocci: add a rename of "struct child_process"'s "env_array" to "env"
781
782
Rename .env_array member to .env in the child_process structure.
783
726
- On hold.
727
- source: <cover-0.3-00000000000-20220406T104134Z-avarab@gmail.com>
728
-
729
-
730
-* gf/shorthand-version-and-help (2022-03-31) 1 commit
731
- (merged to 'next' on 2022-05-12 at 54ca8b25e0)
732
- + cli: add -v and -h shorthands
733
-
734
- "git -v" and "git -h" are now understood as "git --version" and
735
- "git --help".
736
-
737
- Will merge to 'master'.
738
- source: <20220331212709.36036-1-garrit@slashdev.space>
784
+ Expecting a (hopefully final) reroll, before merging it to 'next'.
785
+ cf. <xmqqilq0jhk2.fsf@gitster.g>
786
+ source: <cover-v2-0.4-00000000000-20220520T072122Z-avarab@gmail.com>
787
788
789
* ab/plug-leak-in-revisions (2022-04-13) 28 commits
@@ -831,16 +879,6 @@ Release tarballs are available at:
879
source: <cover-v5-00.29-00000000000-20220421T181526Z-avarab@gmail.com>
880
881
834
-* kf/p4-multiple-remotes (2022-03-21) 1 commit
835
- (merged to 'next' on 2022-05-12 at 447ed8ee3e)
836
- + git-p4: fix issue with multiple perforce remotes
837
-
838
- "git p4" update.
839
-
840
- Will merge to 'master'.
841
- source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
842
-
843
-
882
* ns/batch-fsync (2022-04-06) 13 commits
883
- core.fsyncmethod: performance tests for batch mode
884
- t/perf: add iteration setup mechanism to perf-lib
@@ -860,7 +898,7 @@ Release tarballs are available at:
898
bits for many loose object files are ensured to hit the disk
899
platter.
900
863
- Will merge to 'next'?
901
+ Will merge to 'next'.
902
source: <pull.1134.v5.git.1648616734.gitgitgadget@gmail.com>
903
904
@@ -882,7 +920,7 @@ Release tarballs are available at:
920
source: <pull.1148.v3.git.1650594746.gitgitgadget@gmail.com>
921
922
885
-* tb/cruft-packs (2022-03-02) 17 commits
923
+* tb/cruft-packs (2022-05-20) 17 commits
924
- sha1-file.c: don't freshen cruft packs
925
- builtin/gc.c: conditionally avoid pruning objects via loose
926
- builtin/repack.c: add cruft packs to MIDX during geometric repack
@@ -905,15 +943,15 @@ Release tarballs are available at:
943
instead of ejecting them into loose form to be reclaimed later, has
944
been introduced.
945
908
- Waiting for discussion to settle.
909
- cf. <YiZI99yeijQe5Jaq@google.com>
910
- source: <cover.1646266835.git.me@ttaylorr.com>
946
+ Will merge to 'next'?
947
+ source: <cover.1653088640.git.me@ttaylorr.com>
948
949
950
* tk/simple-autosetupmerge (2022-04-29) 3 commits
914
- - push: new config option "push.autoSetupRemote" supports "simple" push
915
- - push: default to single remote even when not named origin
916
- - branch: new autosetupmerge option 'simple' for matching branches
951
+ (merged to 'next' on 2022-05-19 at 9666852f1e)
952
+ + push: new config option "push.autoSetupRemote" supports "simple" push
953
+ + push: default to single remote even when not named origin
954
+ + branch: new autosetupmerge option 'simple' for matching branches
955
956
"git -c branch.autosetupmerge=simple branch $A $B" will set the $B
957
as $A's upstream only when $A and $B shares the same name, and "git
@@ -921,7 +959,7 @@ Release tarballs are available at:
959
branch $A at the remote $B came from. Also more places use the
960
sole remote, if exists, before defaulting to 'origin'.
961
924
- Will merge to 'next'?
962
+ Will merge to 'master'.
963
source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
964
965
@@ -958,25 +996,25 @@ Release tarballs are available at:
996
997
More fsmonitor--daemon.
998
961
- Expecting a hopefully final reroll.
999
+ Expecting a (hopefully final) reroll, before merging it to 'next'.
1000
cf. <nycvar.QRO.7.76.6.2205121726260.352@tvgsbejvaqbjf.bet>
1001
source: <pull.1143.v6.git.1650662994.gitgitgadget@gmail.com>
1002
1003
966
-* js/scalar-diagnose (2022-05-12) 8 commits
967
- - fixup: archive: optionally add "virtual" files
1004
+* js/scalar-diagnose (2022-05-19) 8 commits
1005
+ - fixup! archive --add-file-with-contents: allow paths containing colons
1006
- scalar: teach `diagnose` to gather loose objects information
1007
- scalar: teach `diagnose` to gather packfile info
1008
- scalar diagnose: include disk space information
971
- - scalar: implement `scalar diagnose`
1009
+ - Implement `scalar diagnose`
1010
- scalar: validate the optional enlistment argument
1011
- archive --add-file-with-contents: allow paths containing colons
1012
- archive: optionally add "virtual" files
1013
1014
Implementation of "scalar diagnose" subcommand.
1015
978
- Will merge to 'next' after squashing the fix in?
979
- source: <pull.1128.v4.git.1652210824.gitgitgadget@gmail.com>
1016
+ Will merge to 'next'?
1017
+ source: <pull.1128.v5.git.1652984283.gitgitgadget@gmail.com>
1018
1019
1020
* en/merge-tree (2022-02-23) 13 commits