What's cooking (2022/05 #07)
Junio C Hamano committed
May 25, 2022 at 17:53 UTC
f532eea27229dd8d87c3114a2ddc02ba18310040
1 file changed
+378
-561
whats-cooking.txt
+378
-561
@@ -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, #06; Fri, 20)
4
-X-master-at: f9b95943b68b6b8ca5a6072f50a08411c6449b55
5
-X-next-at: 6924ef9a07fd4d97a8c929a0a7cbd41bd72df37e
3
+Subject: What's cooking in git.git (May 2022, #07; Wed, 25)
4
+X-master-at: 6afdb07b7b918ed9282ea6e955f53369df862be8
5
+X-next-at: c4f0e309ae745751d08727f24e8ff55e56355755
6
7
-What's cooking in git.git (May 2022, #06; Fri, 20)
7
+What's cooking in git.git (May 2022, #07; Wed, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,7 +14,7 @@ future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
This cycle will conclude in early July (https://tinyurl.com/gitCal);
17
-we have just finished the week #4 of the cycle.
17
+we are in the week #5 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
@@ -47,331 +47,288 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
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
-
54
- Update a few end-user facing messages around eol conversion.
55
- source: <20220408044154.9947-1-alexhenrie24@gmail.com>
56
-
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
-
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
-
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
-
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
-
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.
108
- source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
109
-
110
-
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.)
50
+* ab/commit-plug-leaks (2022-05-12) 1 commit
51
+ (merged to 'next' on 2022-05-16 at 00bcda44af)
52
+ + commit: fix "author_ident" leak
53
117
- Merges up ep/maint-equals-null-cocci to the current codebase.
54
+ Leakfix in the top-level called-once function.
55
+ source: <xmqqzgjmcqlg.fsf@gitster.g>
56
57
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.)
58
+* ab/valgrind-fixes (2022-05-12) 4 commits
59
+ (merged to 'next' on 2022-05-16 at 75d760528f)
60
+ + commit-graph.c: don't assume that stat() succeeds
61
+ + object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
62
+ + log test: skip a failing mkstemp() test under valgrind
63
+ + tests: using custom GIT_EXEC_PATH breaks --valgrind tests
64
+ (this branch is used by ds/object-file-unpack-loose-header-fix.)
65
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.
66
+ A bit of test framework fixes with a few fixes to issues found by
67
+ valgrind.
68
+ source: <20220512223218.237544-1-gitster@pobox.com>
69
70
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
71
+* ep/coverage-report-wants-test-to-have-run (2022-04-13) 1 commit
72
+ (merged to 'next' on 2022-05-18 at e4a51b0867)
73
+ + Makefile: add a prerequisite to the coverage-report target
74
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>
75
+ "make coverage-report" without first running "make coverage" did
76
+ not produce any meaningful result, which has been corrected.
77
+ source: <20220414022513.31465-1-gitter.spiros@gmail.com>
78
79
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
80
+* jc/archive-add-file-normalize-mode (2022-05-12) 1 commit
81
+ (merged to 'next' on 2022-05-16 at 265bb02f2a)
82
+ + archive: do not let on-disk mode leak to zip archives
83
147
- "git -v" and "git -h" are now understood as "git --version" and
148
- "git --help".
149
- source: <20220331212709.36036-1-garrit@slashdev.space>
84
+ "git archive --add-file=<path>" picked up the raw permission bits
85
+ from the path and propagated to zip output in some cases, without
86
+ normalization, which has been corrected (tar output did not have
87
+ this issue).
88
+ source: <xmqqmtfme8v6.fsf@gitster.g>
89
90
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
91
+* jc/avoid-redundant-submodule-fetch (2022-05-18) 1 commit
92
+ (merged to 'next' on 2022-05-19 at 11dabe678b)
93
+ + fetch: do not run a redundant fetch from submodule
94
157
- Remove unused includes.
158
- source: <20220331194436.58005-1-garrit@slashdev.space>
95
+ "git fetch --recurse-submodules" from multiple remotes (either from
96
+ a remote group, or "--all") used to make one extra "git fetch" in
97
+ the submodules, which has been corrected.
98
+ source: <xmqqk0alyqyj.fsf_-_@gitster.g>
99
100
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
101
+* jc/show-branch-g-current (2022-04-21) 1 commit
102
+ (merged to 'next' on 2022-05-18 at 870a1a1a71)
103
+ + show-branch: -g and --current are incompatible
104
165
- Update URL to the gitk repository.
105
+ The "--current" option of "git show-branch" should have been made
106
+ incompatible with the "--reflog" mode, but this was not enforced,
107
+ which has been corrected.
108
+ source: <xmqqh76mf7s4.fsf_-_@gitster.g>
109
110
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
111
+* jt/fetch-peek-optional-section (2022-05-16) 1 commit
112
+ (merged to 'next' on 2022-05-18 at bc876bd2cf)
113
+ + fetch-pack: make unexpected peek result non-fatal
114
177
- Trace2 documentation updates.
178
- source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
115
+ "git fetch" unnecessarily failed when an unexpected optional
116
+ section appeared in the output, which has been corrected.
117
+ source: <20220516110221.3490982-1-jonathantanmy@google.com>
118
119
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
120
+* os/fetch-check-not-current-branch (2022-05-16) 1 commit
121
+ (merged to 'next' on 2022-05-19 at f48dca6322)
122
+ + fetch: limit shared symref check only for local branches
123
185
- "git p4" update.
186
- source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
124
+ The way "git fetch" without "--update-head-ok" ensures that HEAD in
125
+ no worktree points at any ref being updated was too wasteful, which
126
+ has been optimized a bit.
127
+ source: <pull.1266.v2.git.git.1652690501963.gitgitgadget@gmail.com>
128
129
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
130
+* pb/ggg-in-mfc-doc (2022-05-12) 5 commits
131
+ (merged to 'next' on 2022-05-19 at e1c148492f)
132
+ + MyFirstContribution: drop PR description for GGG single-patch contributions
133
+ + MyFirstContribution: reference "The cover letter" in GitGitGadget section
134
+ + MyFirstContribution: reference "The cover letter" in "Preparing Email"
135
+ + MyFirstContribution: add standalone section on cover letter
136
+ + MyFirstContribution: add "Anatomy of a Patch Series" section
137
193
- Test script updates.
194
- source: <20220405134742.17526-2-khalid.masum.92@gmail.com>
138
+ Documentation update.
139
+ source: <pull.1226.v3.git.1652399017.gitgitgadget@gmail.com>
140
141
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
142
+* tb/receive-pack-code-cleanup (2022-05-18) 1 commit
143
+ (merged to 'next' on 2022-05-19 at 756d64f5a2)
144
+ + builtin/receive-pack.c: remove redundant 'if'
145
201
- Build procedure fixup.
202
- source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
146
+ Code clean-up.
147
+ source: <d22f2ca975778d594449857d64be8cd8c0d4a327.1652905549.git.me@ttaylorr.com>
148
149
+--------------------------------------------------
150
+[New Topics]
151
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
152
+* ds/bundle-uri-more (2022-05-20) 24 commits
153
+ - t5601: basic bundle URI tests
154
+ - clone: unbundle the advertised bundles
155
+ - bundle-uri: download bundles from an advertised list
156
+ - bundle-uri: allow relative URLs in bundle lists
157
+ - bundle-uri client: add boolean transfer.bundleURI setting
158
+ - bundle-uri: serve URI advertisement from bundle.* config
159
+ - bundle-uri client: add "git ls-remote-bundle-uri"
160
+ - bundle-uri client: add minimal NOOP client
161
+ - protocol v2: add server-side "bundle-uri" skeleton
162
+ - bundle-uri: fetch a list of bundles
163
+ - bundle-uri: parse bundle list in config format
164
+ - bundle-uri: limit recursion depth for bundle lists
165
+ - bundle-uri: unit test "key=value" parsing
166
+ - bundle-uri: create "key=value" line parsing
167
+ - bundle-uri: create base key-value pair parsing
168
+ - bundle-uri: create bundle_list struct and helpers
169
+ - clone: --bundle-uri cannot be combined with --depth
170
+ - clone: add --bundle-uri option
171
+ - fetch: add 'refs/bundle/' to log.excludeDecoration
172
+ - fetch: add --bundle-uri option
173
+ - bundle-uri: add support for http(s):// and file://
174
+ - bundle-uri: create basic file-copy logic
175
+ - remote-curl: add 'get' capability
176
+ - docs: document bundle URI standard
177
+ (this branch uses ds/bundle-uri.)
178
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>
179
+ source: <pull.1234.git.1653072042.gitgitgadget@gmail.com>
180
+ source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
181
182
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_*
183
+* jc/revert-show-parent-info (2022-05-23) 1 commit
184
+ - revert: optionally refer to commit in the "reference" format
185
221
- Small code clean-up.
222
- source: <pull.1111.v2.git.1649092211419.gitgitgadget@gmail.com>
186
+ source: <xmqqsfp2b30k.fsf@gitster.g>
187
188
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()
189
+* jc/http-clear-finished-pointer (2022-05-24) 1 commit
190
+ - http.c: clear the 'finished' member once we are done with it
191
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>
192
+ Meant to go with js/ci-gcc-12-fixes
193
194
+ Will merge to 'next'?
195
+ source: <xmqqczgqjr8y.fsf_-_@gitster.g>
196
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
197
239
- A test to ensure workaround for an earlier pcre2 bug does work.
240
- source: <3a49649d-8ff9-e5a7-e3fd-33fee5068ae8@web.de>
198
+* js/ci-gcc-12-fixes (2022-05-24) 3 commits
199
+ - dir.c: avoid "exceeds maximum object size" error with GCC v12.x
200
+ - nedmalloc: avoid new compile error
201
+ - compat/win32/syslog: fix use-after-realloc
202
203
+ Fixes real problems noticed by gcc 12 and works around false
204
+ positives.
205
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
206
+ Will merge to 'next'?
207
+ source: <pull.1238.git.1653351786.gitgitgadget@gmail.com>
208
247
- A GSoC practice.
248
- source: <20220412203722.10484-1-siddharthasthana31@gmail.com>
209
210
+* kl/setup-in-unreadable-worktree (2022-05-24) 1 commit
211
+ - setup: don't die if realpath(3) fails on getcwd(3)
212
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
213
+ Disable the "do not remove the directory the user started Git in"
214
+ logic when Git cannot tell where that directory is. Earlier we
215
+ refused to run in such a case.
216
257
- New tests for the safe.directory mechanism.
258
- source: <20220427170649.4949-1-szeder.dev@gmail.com>
217
+ Will merge to 'next'.
218
+ source: <8b20840014d214023c50ee62439147f798e6f9cc.1653419993.git.kevin@kevinlocke.name>
219
220
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
221
+* pb/use-freebsd-12.3-in-cirrus-ci (2022-05-25) 1 commit
222
+ - ci: update Cirrus-CI image to FreeBSD 12.3
223
265
- "git p4" updates.
266
- source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
224
+ Update the version of FreeBSD image used in Cirrus CI.
225
226
+ Will merge to 'next'.
227
+ source: <20220525125112.86954-1-levraiphilippeblain@gmail.com>
228
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
229
273
- "git p4" update.
274
- source: <pull.1203.git.1649051436934.gitgitgadget@gmail.com>
230
+* yw/cmake-updates (2022-05-24) 3 commits
231
+ - cmake: remove (_)UNICODE def on Windows in CMakeLists.txt
232
+ - cmake: add pcre2 support
233
+ - cmake: fix CMakeLists.txt on Linux
234
235
+ CMake updates.
236
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
237
+ Will merge to 'next'?
238
+ source: <pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com>
239
281
- "git p4" update.
282
- source: <pull.1202.git.1649049054600.gitgitgadget@gmail.com>
240
241
+* sg/build-gitweb (2022-05-25) 1 commit
242
+ - Makefile: build 'gitweb' in the default target
243
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
244
+ "make all" should but didn't build "gitweb".
245
294
- Teach "git stash" to work better with sparse index entries.
295
- source: <pull.1171.v3.git.1652225552.gitgitgadget@gmail.com>
246
+ Will merge to 'next'.
247
+ source: <20220525205651.825669-1-szeder.dev@gmail.com>
248
249
--------------------------------------------------
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
250
+[Stalled]
251
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.
252
+* en/merge-tree (2022-02-23) 13 commits
253
+ - git-merge-tree.txt: add a section on potentional usage mistakes
254
+ - merge-tree: add a --allow-unrelated-histories flag
255
+ - merge-tree: allow `ls-files -u` style info to be NUL terminated
256
+ - merge-tree: provide easy access to `ls-files -u` style info
257
+ - merge-tree: provide a list of which files have conflicts
258
+ - merge-ort: provide a merge_get_conflicted_files() helper function
259
+ - merge-tree: support including merge messages in output
260
+ - merge-ort: split out a separate display_update_messages() function
261
+ - merge-tree: implement real merges
262
+ - merge-tree: add option parsing and initial shell for real merge function
263
+ - merge-tree: move logic for existing merge into new function
264
+ - merge-tree: rename merge_trees() to trivial_merge_trees()
265
+ - Merge branch 'en/remerge-diff' into en/merge-trees
266
340
- Will merge to 'next'.
341
- source: <xmqqbkvtnyae.fsf@gitster.g>
267
+ A new command is introduced that takes two commits and computes a
268
+ tree that would be contained in the resulting merge commit, if the
269
+ histories leading to these two commits were to be merged, and is
270
+ added as a new mode of "git merge-tree" subcommand.
271
272
+ On hold.
273
+ cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
274
+ source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
275
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
276
349
- source: <cover.1653073280.git.me@ttaylorr.com>
277
+* ab/ci-github-workflow-markup (2022-05-22) 12 commits
278
+ . fixup! ci: make it easier to find failed tests' logs in the GitHub workflow
279
+ . ci: call `finalize_test_case_output` a little later
280
+ . ci: use `--github-workflow-markup` in the GitHub workflow
281
+ . ci: optionally mark up output in the GitHub workflow
282
+ . test(junit): avoid line feeds in XML attributes
283
+ . tests: refactor --write-junit-xml code
284
+ . ci: make it easier to find failed tests' logs in the GitHub workflow
285
+ . CI: stop setting FAILED_TEST_ARTIFACTS N times
286
+ . CI: don't include "test-results/" in ci/print-test-failures.sh output
287
+ . CI: add --exit-code to ci/print-test-failures.sh
288
+ . CI: don't "cd" in ci/print-test-failures.sh
289
+ . Merge branch 'ab/ci-setup-simplify' into ab/ci-github-workflow-markup
290
+ (this branch uses ab/ci-setup-simplify.)
291
351
---------------------------------------------------
352
-[Stalled]
292
+ Build a moral equivalent of js/ci-github-workflow-markup on top of
293
+ ab/ci-setup-simplify.
294
+ source: <RFC-cover-v5-00.10-00000000000-20220421T183001Z-avarab@gmail.com>
295
354
-* js/bisect-in-c (2022-02-23) 14 commits
355
- - bisect: no longer try to clean up left-over `.git/head-name` files
356
- - bisect: remove Cogito-related code
357
- - bisect: turn `git bisect` into a full built-in
358
- - bisect: move even the option parsing to `bisect--helper`
359
- - bisect--helper: return only correct exit codes in `cmd_*()`
360
- - bisect--helper: move the `BISECT_STATE` case to the end
361
- - bisect--helper: make `--bisect-state` optional
362
- - bisect--helper: align the sub-command order with git-bisect.sh
363
- - bisect--helper: using `--bisect-state` without an argument is a bug
364
- - bisect--helper: really retire `--bisect-autostart`
365
- - bisect--helper: really retire --bisect-next-check
366
- - bisect--helper: retire the --no-log option
367
- - bisect: avoid double-quoting when printing the failed command
368
- - bisect run: fix the error message
296
370
- Final bits of "git bisect.sh" have been rewritten in C.
297
+* ab/ci-setup-simplify (2022-04-21) 29 commits
298
+ . CI: make it easy to use ci/*.sh outside of CI
299
+ . CI: don't use "set -x" in "ci/lib.sh" output
300
+ . CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
301
+ . CI: set SANITIZE=leak in MAKEFLAGS directly
302
+ . CI: set CC in MAKEFLAGS directly, don't add it to the environment
303
+ . CI: add more variables to MAKEFLAGS, except under vs-build
304
+ . CI: narrow down variable definitions in --build and --test
305
+ . CI: only invoke ci/lib.sh as "steps" in main.yml
306
+ . CI: pre-select test slice in Windows & VS tests
307
+ . ci/run-test-slice.sh: replace shelling out with "echo"
308
+ . CI: move "env" definitions into ci/lib.sh
309
+ . CI: combine ci/install{,-docker}-dependencies.sh
310
+ . CI: split up and reduce "ci/test-documentation.sh"
311
+ . CI: invoke "make artifacts-tar" directly in windows-build
312
+ . CI: check ignored unignored build artifacts in "win[+VS] build" too
313
+ . CI: make ci/{lib,install-dependencies}.sh POSIX-compatible
314
+ . CI: remove "run-build-and-tests.sh", run "make [test]" directly
315
+ . CI: export variables via a wrapper
316
+ . CI: consistently use "export" in ci/lib.sh
317
+ . CI: move p4 and git-lfs variables to ci/install-dependencies.sh
318
+ . CI: have "static-analysis" run "check-builtins", not "documentation"
319
+ . CI: have "static-analysis" run a "make ci-static-analysis" target
320
+ . CI: don't have "git grep" invoke a pager in tree content check
321
+ . CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS
322
+ . CI: remove unused Azure ci/* code
323
+ . CI: remove dead "tree skipping" code
324
+ . CI: remove more dead Travis CI support
325
+ . CI: make "$jobname" explicit, remove fallback
326
+ . CI: run "set -ex" early in ci/lib.sh
327
+ (this branch is used by ab/ci-github-workflow-markup.)
328
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>
329
+ Drive more actions done in CI via the Makefile instead of shell
330
+ commands sprinkled in .github/workflows/main.yml
331
+ source: <cover-v5-00.29-00000000000-20220421T181526Z-avarab@gmail.com>
332
333
334
* et/xdiff-indirection (2022-02-17) 1 commit
@@ -385,25 +342,6 @@ Release tarballs are available at:
342
source: <20220217225408.GB7@edef91d97c94>
343
344
388
-* js/ci-github-workflow-markup (2022-03-01) 9 commits
389
- - ci: call `finalize_test_case_output` a little later
390
- - ci: use `--github-workflow-markup` in the GitHub workflow
391
- - ci: optionally mark up output in the GitHub workflow
392
- - test(junit): avoid line feeds in XML attributes
393
- - tests: refactor --write-junit-xml code
394
- - ci/run-build-and-tests: add some structure to the GitHub workflow output
395
- - ci: make it easier to find failed tests' logs in the GitHub workflow
396
- - ci/run-build-and-tests: take a more high-level view
397
- - ci: fix code style
398
-
399
- Update the GitHub workflow support to make it quicker to get to the
400
- failing test.
401
-
402
- Expecting a reroll.
403
- cf. <52382f7c-5b6a-63b6-2eb2-26c12f31f529@gmail.com>
404
- source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
405
-
406
-
345
* bc/stash-export (2022-04-08) 4 commits
346
- builtin/stash: provide a way to import stashes from a ref
347
- builtin/stash: provide a way to export stashes to a ref
@@ -445,34 +383,109 @@ Release tarballs are available at:
383
. introduce submodule.hasSuperproject record
384
. t7400-submodule-basic: modernize inspect() helper
385
448
- A configuration variable in a repository tells if it is (or is not)
449
- a submodule of a superproject.
386
+ A configuration variable in a repository tells if it is (or is not)
387
+ a submodule of a superproject.
388
+
389
+ Will discard, as it has been stalled for way too long.
390
+ cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
391
+ source: <20220310004423.2627181-1-emilyshaffer@google.com>
392
+
393
+
394
+* cw/remote-object-info (2022-05-06) 11 commits
395
+ - SQUASH??? coccicheck
396
+ - SQUASH??? ensure that coccicheck is happy
397
+ - SQUASH??? compilation fix
398
+ - cat-file: add --batch-command remote-object-info command
399
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
400
+ - transport: add object-info fallback to fetch
401
+ - transport: add client side capability to request object-info
402
+ - object-info: send attribute packet regardless of object ids
403
+ - object-store: add function to free object_info contents
404
+ - fetch-pack: move fetch default settings
405
+ - fetch-pack: refactor packet writing
406
+
407
+ A client component to talk with the object-info endpoint.
408
+
409
+ Expecting a reroll.
410
+ source: <20220502170904.2770649-1-calvinwan@google.com>
411
+
412
+--------------------------------------------------
413
+[Cooking]
414
+
415
+* js/ci-github-workflow-markup (2022-05-21) 12 commits
416
+ - ci: call `finalize_test_case_output` a little later
417
+ - ci(github): mention where the full logs can be found
418
+ - ci: use `--github-workflow-markup` in the GitHub workflow
419
+ - ci(github): avoid printing test case preamble twice
420
+ - ci(github): skip the logs of the successful test cases
421
+ - ci: optionally mark up output in the GitHub workflow
422
+ - ci/run-build-and-tests: add some structure to the GitHub workflow output
423
+ - ci: make it easier to find failed tests' logs in the GitHub workflow
424
+ - ci/run-build-and-tests: take a more high-level view
425
+ - test(junit): avoid line feeds in XML attributes
426
+ - tests: refactor --write-junit-xml code
427
+ - ci: fix code style
428
+
429
+ Update the GitHub workflow support to make it quicker to get to the
430
+ failing test.
431
+
432
+ Will merge to 'next'?
433
+ source: <pull.1117.v3.git.1653171536.gitgitgadget@gmail.com>
434
+
435
+
436
+* js/bisect-in-c (2022-05-21) 15 commits
437
+ - bisect: no longer try to clean up left-over `.git/head-name` files
438
+ - bisect: remove Cogito-related code
439
+ - Turn `git bisect` into a full built-in
440
+ - bisect: teach the `bisect--helper` command to show the correct usage strings
441
+ - bisect: move even the command-line parsing to `bisect--helper`
442
+ - bisect--helper: return only correct exit codes in `cmd_*()`
443
+ - bisect--helper: move the `BISECT_STATE` case to the end
444
+ - bisect--helper: make `--bisect-state` optional
445
+ - bisect--helper: align the sub-command order with git-bisect.sh
446
+ - bisect--helper: using `--bisect-state` without an argument is a bug
447
+ - bisect--helper: really retire `--bisect-autostart`
448
+ - bisect--helper: really retire --bisect-next-check
449
+ - bisect--helper: retire the --no-log option
450
+ - bisect: avoid double-quoting when printing the failed command
451
+ - bisect run: fix the error message
452
+
453
+ Final bits of "git bisect.sh" have been rewritten in C.
454
+
455
+ Will merge to 'next'?
456
+ source: <pull.1132.v3.git.1653144546.gitgitgadget@gmail.com>
457
+
458
+
459
+* cb/path-owner-check-with-sudo-plus (2022-05-12) 1 commit
460
+ - git-compat-util: allow root to access both SUDO_UID and root owned
461
+ (this branch uses cb/path-owner-check-with-sudo.)
462
+
463
+ "sudo git foo" used to consider a repository owned by the original
464
+ user a safe one to access; it now also considers a repository owned
465
+ by root a safe one, too (after all, if an attacker can craft a
466
+ malicious repository owned by root, the box is 0wned already).
467
+ source: <20220513010020.55361-1-carenas@gmail.com>
468
+
469
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>
470
+* jc/t6424-failing-merge-preserve-local-changes (2022-05-19) 1 commit
471
+ (merged to 'next' on 2022-05-23 at 849cf6f24c)
472
+ + t6424: make sure a failed merge preserves local changes
473
474
+ The tests that ensured merges stop when interfering local changes
475
+ are present did not make sure that local changes are preserved; now
476
+ they do.
477
456
-* cw/remote-object-info (2022-05-06) 11 commits
457
- - SQUASH??? coccicheck
458
- - SQUASH??? ensure that coccicheck is happy
459
- - SQUASH??? compilation fix
460
- - cat-file: add --batch-command remote-object-info command
461
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
462
- - transport: add object-info fallback to fetch
463
- - transport: add client side capability to request object-info
464
- - object-info: send attribute packet regardless of object ids
465
- - object-store: add function to free object_info contents
466
- - fetch-pack: move fetch default settings
467
- - fetch-pack: refactor packet writing
478
+ Will merge to 'master'.
479
+ source: <xmqqbkvtnyae.fsf@gitster.g>
480
469
- A client component to talk with the object-info endpoint.
481
471
- Expecting a reroll.
472
- source: <20220502170904.2770649-1-calvinwan@google.com>
482
+* tb/geom-repack-with-keep-and-max (2022-05-20) 3 commits
483
+ - builtin/repack.c: ensure that `names` is sorted
484
+ - t7703: demonstrate object corruption with pack.packSizeLimit
485
+ - repack: respect --keep-pack with geometric repack
486
+
487
+ source: <cover.1653073280.git.me@ttaylorr.com>
488
474
---------------------------------------------------
475
-[Cooking]
489
490
* ab/hooks-regression-fix (2022-05-18) 8 commits
491
- hook API: fix v2.36.0 regression: hooks should be connected to a TTY
@@ -491,59 +504,39 @@ Release tarballs are available at:
504
source: <cover-v2-0.8-00000000000-20220518T195858Z-avarab@gmail.com>
505
506
494
-* tb/midx-race-in-pack-objects (2022-05-13) 2 commits
507
+* tb/midx-race-in-pack-objects (2022-05-24) 4 commits
508
- builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
496
- - pack-bitmap: check preferred pack validity when opening MIDX bitmap
509
+ - builtin/pack-objects.c: ensure included `--stdin-packs` exist
510
+ - builtin/pack-objects.c: avoid redundant NULL check
511
+ - pack-bitmap.c: check preferred pack validity when opening MIDX bitmap
512
513
The multi-pack-index code did not protect the packfile it is going
514
to depend on from getting removed while in use, which has been
515
corrected.
516
502
- Expecting a reroll.
503
- cf. <Yn63nDhSBIEa3/+/@nand.local>
504
- cf. <Yn+v8mEHm2sfo4sn@nand.local>
505
- source: <cover.1652458395.git.me@ttaylorr.com>
517
+ Will merge to 'next'?
518
+ source: <cover.1653418457.git.me@ttaylorr.com>
519
520
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
521
+* ds/bundle-uri (2022-05-16) 8 commits
522
+ (merged to 'next' on 2022-05-25 at 43b1b9092c)
523
+ + bundle.h: make "fd" version of read_bundle_header() public
524
+ + remote: allow relative_url() to return an absolute url
525
+ + remote: move relative_url()
526
+ + http: make http_get_file() external
527
+ + fetch-pack: move --keep=* option filling to a function
528
+ + fetch-pack: add a deref_without_lazy_fetch_extended()
529
+ + dir API: add a generalized path_match_flags() function
530
+ + connect.c: refactor sending of agent & object-format
531
+ (this branch is used by ds/bundle-uri-more.)
532
533
+ Preliminary code refactoring around transport and bundle code.
534
+
535
+ Will merge to 'master'.
536
source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
543
- source: <pull.1234.git.1653072042.gitgitgadget@gmail.com>
537
538
546
-* ds/sparse-sparse-checkout (2022-05-19) 10 commits
539
+* ds/sparse-sparse-checkout (2022-05-23) 10 commits
540
- sparse-checkout: integrate with sparse index
541
- p2000: add test for 'git sparse-checkout [add|set]'
542
- sparse-index: complete partial expansion
@@ -551,13 +544,15 @@ Release tarballs are available at:
544
- sparse-checkout: --no-sparse-index needs a full index
545
- cache-tree: implement cache_tree_find_path()
546
- sparse-index: introduce partially-sparse indexes
554
- - sparse-index: create expand_to_pattern_list()
547
+ - sparse-index: create expand_index()
548
- t1092: stress test 'git sparse-checkout set'
549
- t1092: refactor 'sparse-index contents' test
550
551
"sparse-checkout" learns to work well with the sparse-index
552
feature.
560
- source: <pull.1208.v2.git.1652982758.gitgitgadget@gmail.com>
553
+
554
+ Will merge to 'next'?
555
+ source: <pull.1208.v3.git.1653313726.gitgitgadget@gmail.com>
556
557
558
* gc/bare-repo-discovery (2022-05-16) 3 commits
@@ -572,32 +567,8 @@ Release tarballs are available at:
567
source: <pull.1261.v2.git.git.1652485058.gitgitgadget@gmail.com>
568
569
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
-
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'.
583
- source: <20220516110221.3490982-1-jonathantanmy@google.com>
584
-
585
-
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
-
594
- Will merge to 'master'.
595
- source: <pull.1266.v2.git.git.1652690501963.gitgitgadget@gmail.com>
596
-
597
-
570
* ds/object-file-unpack-loose-header-fix (2022-05-16) 1 commit
571
- object-file: convert 'switch' back to 'if'
600
- (this branch uses ab/valgrind-fixes.)
572
573
Coding style fix.
574
@@ -618,44 +589,6 @@ Release tarballs are available at:
589
source: <20220520192840.8942-1-ggossdev@gmail.com>
590
591
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
-
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'.
631
- source: <xmqqmtfme8v6.fsf@gitster.g>
632
-
633
-
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
-
638
- Leakfix in the top-level called-once function.
639
-
640
- Will merge to 'master'.
641
- source: <xmqqzgjmcqlg.fsf@gitster.g>
642
-
643
-
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
-
652
- A bit of test framework fixes with a few fixes to issues found by
653
- valgrind.
654
-
655
- Will merge to 'master'.
656
- source: <20220512223218.237544-1-gitster@pobox.com>
657
-
658
-
592
* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
593
(merged to 'next' on 2022-05-20 at 8d2dc10d8f)
594
+ builtin/remote.c: teach `-v` to list filters for promisor remotes
@@ -679,19 +612,20 @@ Release tarballs are available at:
612
source: <20220516083851.202057-1-chriscool@tuxfamily.org>
613
614
682
-* jx/l10n-workflow-change (2022-05-19) 9 commits
615
+* jx/l10n-workflow-change (2022-05-23) 8 commits
616
- l10n: Document the new l10n workflow
617
- Makefile: add "po-init" rule to initialize po/XX.po
618
- Makefile: add "po-update" rule to update po/XX.po
619
- po/git.pot: don't check in result of "make pot"
687
- - po/git.pot: this is now a generated file
620
- i18n CI: stop allowing non-ASCII source messages in po/git.pot
621
- Makefile: have "make pot" not "reset --hard"
622
- Makefile: generate "po/git.pot" from stable LOCALIZED_C
623
- Makefile: sort "po/git.pot" by file location
624
625
A workflow change for translators are being proposed.
694
- source: <20220503132354.9567-1-worldhello.net@gmail.com>
626
+
627
+ Will merge to 'next'?
628
+ source: <20220523012531.4505-1-worldhello.net@gmail.com>
629
630
631
* cb/path-owner-check-with-sudo (2022-05-12) 3 commits
@@ -710,20 +644,6 @@ Release tarballs are available at:
644
source: <20220513010020.55361-1-carenas@gmail.com>
645
646
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
-
721
- Documentation update.
722
-
723
- Will merge to 'master'.
724
- source: <pull.1226.v3.git.1652399017.gitgitgadget@gmail.com>
725
-
726
-
647
* cg/tools-for-git-doc (2022-04-21) 1 commit
648
(merged to 'next' on 2022-05-19 at e6b6309afb)
649
+ Documentation/ToolsForGit.txt: Tools for developing Git
@@ -734,18 +654,6 @@ Release tarballs are available at:
654
source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
655
656
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
-
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'.
746
- source: <xmqqh76mf7s4.fsf_-_@gitster.g>
747
-
748
-
657
* ar/send-email-confirm-by-default (2022-04-22) 1 commit
658
- send-email: always confirm by default
659
@@ -762,17 +670,6 @@ Release tarballs are available at:
670
source: <20220422083629.1404989-1-hi@alyssa.is>
671
672
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
-
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'.
773
- source: <20220414022513.31465-1-gitter.spiros@gmail.com>
774
-
775
-
673
* ab/env-array (2022-05-20) 4 commits
674
- run-command API users: use "env" not "env_array" in comments & names
675
- cocci: remove env_array -> env migration
@@ -819,86 +716,31 @@ Release tarballs are available at:
716
Plug the memory leaks from the trickiest API of all, the revision
717
walker.
718
822
- On hold.
719
+ Will merge to 'next'?
720
source: <cover-v6-00.27-00000000000-20220413T195935Z-avarab@gmail.com>
721
722
826
-* ab/ci-github-workflow-markup (2022-04-21) 11 commits
827
- . ci: call `finalize_test_case_output` a little later
828
- . ci: use `--github-workflow-markup` in the GitHub workflow
829
- . ci: optionally mark up output in the GitHub workflow
830
- . test(junit): avoid line feeds in XML attributes
831
- . tests: refactor --write-junit-xml code
832
- . ci: make it easier to find failed tests' logs in the GitHub workflow
833
- . CI: stop setting FAILED_TEST_ARTIFACTS N times
834
- . CI: don't include "test-results/" in ci/print-test-failures.sh output
835
- . CI: add --exit-code to ci/print-test-failures.sh
836
- . CI: don't "cd" in ci/print-test-failures.sh
837
- . Merge branch 'ab/ci-setup-simplify' into ab/ci-github-workflow-markup
838
- (this branch uses ab/ci-setup-simplify.)
839
-
840
- Build a moral equivalent of js/ci-github-workflow-markup on top of
841
- ab/ci-setup-simplify.
842
- source: <RFC-cover-v5-00.10-00000000000-20220421T183001Z-avarab@gmail.com>
843
-
844
-
845
-* ab/ci-setup-simplify (2022-04-21) 29 commits
846
- . CI: make it easy to use ci/*.sh outside of CI
847
- . CI: don't use "set -x" in "ci/lib.sh" output
848
- . CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
849
- . CI: set SANITIZE=leak in MAKEFLAGS directly
850
- . CI: set CC in MAKEFLAGS directly, don't add it to the environment
851
- . CI: add more variables to MAKEFLAGS, except under vs-build
852
- . CI: narrow down variable definitions in --build and --test
853
- . CI: only invoke ci/lib.sh as "steps" in main.yml
854
- . CI: pre-select test slice in Windows & VS tests
855
- . ci/run-test-slice.sh: replace shelling out with "echo"
856
- . CI: move "env" definitions into ci/lib.sh
857
- . CI: combine ci/install{,-docker}-dependencies.sh
858
- . CI: split up and reduce "ci/test-documentation.sh"
859
- . CI: invoke "make artifacts-tar" directly in windows-build
860
- . CI: check ignored unignored build artifacts in "win[+VS] build" too
861
- . CI: make ci/{lib,install-dependencies}.sh POSIX-compatible
862
- . CI: remove "run-build-and-tests.sh", run "make [test]" directly
863
- . CI: export variables via a wrapper
864
- . CI: consistently use "export" in ci/lib.sh
865
- . CI: move p4 and git-lfs variables to ci/install-dependencies.sh
866
- . CI: have "static-analysis" run "check-builtins", not "documentation"
867
- . CI: have "static-analysis" run a "make ci-static-analysis" target
868
- . CI: don't have "git grep" invoke a pager in tree content check
869
- . CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS
870
- . CI: remove unused Azure ci/* code
871
- . CI: remove dead "tree skipping" code
872
- . CI: remove more dead Travis CI support
873
- . CI: make "$jobname" explicit, remove fallback
874
- . CI: run "set -ex" early in ci/lib.sh
875
- (this branch is used by ab/ci-github-workflow-markup.)
876
-
877
- Drive more actions done in CI via the Makefile instead of shell
878
- commands sprinkled in .github/workflows/main.yml
879
- source: <cover-v5-00.29-00000000000-20220421T181526Z-avarab@gmail.com>
880
-
881
-
723
* 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
885
- - core.fsyncmethod: tests for batch mode
886
- - test-lib-functions: add parsing helpers for ls-files and ls-tree
887
- - core.fsync: use batch mode and sync loose objects by default on Windows
888
- - unpack-objects: use the bulk-checkin infrastructure
889
- - update-index: use the bulk-checkin infrastructure
890
- - builtin/add: add ODB transaction around add_files_to_cache
891
- - cache-tree: use ODB transaction around writing a tree
892
- - core.fsyncmethod: batched disk flushes for loose-objects
893
- - bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'
894
- - bulk-checkin: rename 'state' variable and separate 'plugged' boolean
895
- - Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
724
+ (merged to 'next' on 2022-05-23 at 379d8bd500)
725
+ + core.fsyncmethod: performance tests for batch mode
726
+ + t/perf: add iteration setup mechanism to perf-lib
727
+ + core.fsyncmethod: tests for batch mode
728
+ + test-lib-functions: add parsing helpers for ls-files and ls-tree
729
+ + core.fsync: use batch mode and sync loose objects by default on Windows
730
+ + unpack-objects: use the bulk-checkin infrastructure
731
+ + update-index: use the bulk-checkin infrastructure
732
+ + builtin/add: add ODB transaction around add_files_to_cache
733
+ + cache-tree: use ODB transaction around writing a tree
734
+ + core.fsyncmethod: batched disk flushes for loose-objects
735
+ + bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'
736
+ + bulk-checkin: rename 'state' variable and separate 'plugged' boolean
737
+ + Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
738
739
Introduce a filesystem-dependent mechanism to optimize the way the
740
bits for many loose object files are ensured to hit the disk
741
platter.
742
901
- Will merge to 'next'.
743
+ Will merge to 'master'.
744
source: <pull.1134.v5.git.1648616734.gitgitgadget@gmail.com>
745
746
@@ -920,7 +762,7 @@ Release tarballs are available at:
762
source: <pull.1148.v3.git.1650594746.gitgitgadget@gmail.com>
763
764
923
-* tb/cruft-packs (2022-05-20) 17 commits
765
+* tb/cruft-packs (2022-05-25) 18 commits
766
- sha1-file.c: don't freshen cruft packs
767
- builtin/gc.c: conditionally avoid pruning objects via loose
768
- builtin/repack.c: add cruft packs to MIDX during geometric repack
@@ -936,6 +778,7 @@ Release tarballs are available at:
778
- pack-mtimes: support writing pack .mtimes files
779
- chunk-format.h: extract oid_version()
780
- pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
781
+ - fixup! pack-mtimes: support reading .mtimes files
782
- pack-mtimes: support reading .mtimes files
783
- Documentation/technical: add cruft-packs.txt
784
@@ -943,7 +786,7 @@ Release tarballs are available at:
786
instead of ejecting them into loose form to be reclaimed later, has
787
been introduced.
788
946
- Will merge to 'next'?
789
+ Will merge to 'next' after squashing fixup! in???
790
source: <cover.1653088640.git.me@ttaylorr.com>
791
792
@@ -963,10 +806,12 @@ Release tarballs are available at:
806
source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
807
808
966
-* jh/builtin-fsmonitor-part3 (2022-04-22) 29 commits
809
+* jh/builtin-fsmonitor-part3 (2022-05-25) 31 commits
810
+ - t7527: improve implicit shutdown testing in fsmonitor--daemon
811
- fsmonitor--daemon: allow --super-prefix argument
812
- t7527: test Unicode NFC/NFD handling on MacOS
813
- t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
814
+ - t/helper/hexdump: add helper to print hexdump of stdin
815
- fsmonitor: on macOS also emit NFC spelling for NFD pathname
816
- t7527: test FSMonitor on case insensitive+preserving file system
817
- fsmonitor: never set CE_FSMONITOR_VALID on submodules
@@ -996,64 +841,36 @@ Release tarballs are available at:
841
842
More fsmonitor--daemon.
843
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>
844
+ Expecting further work.
845
+ Breaks its own t7527?
846
+ source: <pull.1143.v8.git.1653490852.gitgitgadget@gmail.com>
847
848
1004
-* js/scalar-diagnose (2022-05-19) 8 commits
1005
- - fixup! archive --add-file-with-contents: allow paths containing colons
849
+* js/scalar-diagnose (2022-05-25) 9 commits
850
+ - fixup! archive --add-virtual-file: allow paths containing colons
851
+ - fixup! archive: optionally add "virtual" files
852
- scalar: teach `diagnose` to gather loose objects information
853
- scalar: teach `diagnose` to gather packfile info
854
- scalar diagnose: include disk space information
855
- Implement `scalar diagnose`
856
- scalar: validate the optional enlistment argument
1011
- - archive --add-file-with-contents: allow paths containing colons
857
+ - archive --add-virtual-file: allow paths containing colons
858
- archive: optionally add "virtual" files
859
860
Implementation of "scalar diagnose" subcommand.
861
862
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
1021
- - git-merge-tree.txt: add a section on potentional usage mistakes
1022
- - merge-tree: add a --allow-unrelated-histories flag
1023
- - merge-tree: allow `ls-files -u` style info to be NUL terminated
1024
- - merge-tree: provide easy access to `ls-files -u` style info
1025
- - merge-tree: provide a list of which files have conflicts
1026
- - merge-ort: provide a merge_get_conflicted_files() helper function
1027
- - merge-tree: support including merge messages in output
1028
- - merge-ort: split out a separate display_update_messages() function
1029
- - merge-tree: implement real merges
1030
- - merge-tree: add option parsing and initial shell for real merge function
1031
- - merge-tree: move logic for existing merge into new function
1032
- - merge-tree: rename merge_trees() to trivial_merge_trees()
1033
- - Merge branch 'en/remerge-diff' into en/merge-trees
1034
-
1035
- A new command is introduced that takes two commits and computes a
1036
- tree that would be contained in the resulting merge commit, if the
1037
- histories leading to these two commits were to be merged, and is
1038
- added as a new mode of "git merge-tree" subcommand.
1039
-
1040
- On hold.
1041
- cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
1042
- source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
863
+ source: <pull.1128.v6.git.1653145696.gitgitgadget@gmail.com>
864
865
866
* js/use-builtin-add-i (2021-12-01) 2 commits
1046
- - add -i: default to the built-in implementation
1047
- - t2016: require the PERL prereq only when necessary
867
+ (merged to 'next' on 2022-05-23 at a6434bc6f7)
868
+ + add -i: default to the built-in implementation
869
+ + t2016: require the PERL prereq only when necessary
870
871
"git add -i" was rewritten in C some time ago and has been in
872
testing; the reimplementation is now exposed to general public by
873
default.
874
1053
- On hold.
1054
-
1055
- What's the status of the "known breakage"?
1056
- Are we ready to switch if we wanted to?
1057
- There are known breakages on macOS.
1058
- cf. <nycvar.QRO.7.76.6.2112021832060.63@tvgsbejvaqbjf.bet>
875
+ Will merge to 'master'.
876
source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>