What's cooking (2021/07 #03)
Junio C Hamano committed
Jul 13, 2021 at 18:05 UTC
03a45dd540e27aad6d50ad99a9cf58df1d6b405e
1 file changed
+289
-496
whats-cooking.txt
+289
-496
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2021, #02; Thu, 8)
4
-X-master-at: d486ca60a51c9cb1fe068803c3f540724e95e83a
5
-X-next-at: 085311d9fa98621e847267e9cea4a891cc4ca32e
3
+Subject: What's cooking in git.git (Jul 2021, #03; Tue, 13)
4
+X-master-at: 75ae10bc75336db031ee58d13c5037b929235912
5
+X-next-at: abb21c7263616f01c5e950861a29279ab21cb02f
6
7
-What's cooking in git.git (Jul 2021, #02; Thu, 8)
7
+What's cooking in git.git (Jul 2021, #03; Tue, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,305 +49,229 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[Graduated to 'master']
51
52
-* ab/cmd-foo-should-return (2021-06-09) 1 commit
53
- (merged to 'next' on 2021-07-02 at 4f91c90007)
54
- + builtins + test helpers: use return instead of exit() in cmd_*
55
-
56
- Code clean-up.
57
-
58
-
59
-* ab/config-hooks-path-testfix (2021-06-16) 1 commit
60
- (merged to 'next' on 2021-07-01 at 2ab6dbe8af)
61
- + pre-commit hook tests: don't leave "actual" nonexisting on failure
62
-
63
- Test fix.
64
-
65
-
66
-* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit
67
- (merged to 'next' on 2021-07-01 at e8cbef661b)
68
- + test-lib.sh: set COLUMNS=80 for --verbose repeatability
69
-
70
- Output from some of our tests were affected by the width of the
71
- terminal that they were run in, which has been corrected by
72
- exporting a fixed value in the COLUMNS environment.
73
-
74
-
75
-* ab/progress-cleanup (2021-06-08) 1 commit
76
- (merged to 'next' on 2021-07-02 at 288570c95a)
77
- + read-cache.c: don't guard calls to progress.c API
78
-
79
- Code clean-up.
80
-
81
-
82
-* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
83
- (merged to 'next' on 2021-07-02 at f4920ba6d1)
84
- + xdiff: use BUG(...), not xdl_bug(...)
85
-
86
- Code clean-up.
87
-
88
-
89
-* ah/graph-typofix (2021-06-15) 1 commit
90
- (merged to 'next' on 2021-07-01 at c71fb8cbcb)
91
- + graph: improve grammar of "invalid color" error message
92
-
93
- Typofix in an error message.
94
-
95
-
96
-* ah/uninitialized-reads-fix (2021-06-15) 3 commits
97
- (merged to 'next' on 2021-07-01 at 61a967c340)
98
- + builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
99
- + split-index: use oideq instead of memcmp to compare object_id's
100
- + bulk-checkin: make buffer reuse more obvious and safer
101
-
102
- Make the codebase MSAN clean.
103
-
104
-
105
-* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
106
- (merged to 'next' on 2021-07-02 at a0e3a1f5f2)
107
- + MyFirstContribution: link #git-devel to Libera Chat
108
-
109
- Update MyFirst document.
110
-
111
-
112
-* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
113
- (merged to 'next' on 2021-07-02 at e5122960c0)
114
- + mailinfo: use starts_with() when checking scissors
115
-
116
- Code clean-up.
117
-
118
-
119
-* ar/more-typofix (2021-06-28) 3 commits
120
- (merged to 'next' on 2021-07-01 at 02ca61ee96)
121
- + git-worktree.txt: fix typo in example path
122
- + t: fix typos in test messages
123
- + blame: correct name of config option in docs
124
-
125
- Typofixes.
126
-
127
-
128
-* ar/test-code-cleanup (2021-06-08) 1 commit
129
- (merged to 'next' on 2021-07-02 at 12d23f8a42)
130
- + t: fix whitespace around &&
131
-
132
- Test code clean-up.
133
-
134
-
135
-* ar/typofix (2021-06-14) 1 commit
136
- (merged to 'next' on 2021-07-01 at 8d10d6d568)
137
- + *: fix typos which duplicate a word
138
-
139
- Typofixes.
140
-
141
-
142
-* ba/object-info (2021-06-08) 1 commit
143
- (merged to 'next' on 2021-07-02 at c7fb4f900e)
144
- + protocol-caps.h: add newline at end of file
145
-
146
- Code clean-up.
147
-
148
-
149
-* dd/document-log-decorate-default (2021-06-08) 1 commit
150
- (merged to 'next' on 2021-07-02 at 529d71a690)
151
- + doc/log: correct default for --decorate
152
-
153
- Doc clean-up.
154
-
155
-
156
-* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
157
- (merged to 'next' on 2021-07-01 at 9fa432af22)
158
- + t: use user-specified utf-8 locale for testing svn
159
-
160
- "git-svn" tests assumed that "locale -a", which is used to pick an
161
- available UTF-8 locale, is available everywhere. A knob has been
162
- introduced to allow testers to specify a suitable locale to use.
163
-
164
-
165
-* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
166
- (merged to 'next' on 2021-07-01 at 3ce7d14f26)
167
- + doc: merge: mention default of defaulttoupstream
168
-
169
- Doc clean-up.
170
-
171
-
172
-* fc/pull-cleanups (2021-06-19) 3 commits
173
- (merged to 'next' on 2021-07-01 at f8d7a3fc78)
174
- + pull: trivial whitespace style fix
175
- + pull: trivial cleanup
176
- + pull: cleanup autostash check
177
-
178
- Code cleanup.
179
-
180
-
181
-* fw/complete-cmd-idx-fix (2021-06-19) 1 commit
182
- (merged to 'next' on 2021-07-01 at f16784c4cb)
183
- + completion: bash: fix late declaration of __git_cmd_idx
184
-
185
- Recent update to completion script (in contrib/) broke those who
186
- use the __git_complete helper to define completion to their custom
187
- command.
188
-
189
-
190
-* jk/bitmap-tree-optim (2021-06-15) 1 commit
191
- (merged to 'next' on 2021-07-01 at 2e0f108bb6)
192
- + bitmaps: don't recurse into trees already in the bitmap
193
-
194
- Avoid duplicated work while building reachability bitmaps.
52
+* ab/describe-tests-fix (2021-05-11) 5 commits
53
+ (merged to 'next' on 2021-07-06 at ba1f7c0364)
54
+ + describe tests: support -C in "check_describe"
55
+ + describe tests: fix nested "test_expect_success" call
56
+ + describe tests: don't rely on err.actual from "check_describe"
57
+ + describe tests: refactor away from glob matching
58
+ + describe tests: improve test for --work-tree & --dirty
59
60
+ Various updates to tests around "git describe"
61
197
-* jk/doc-max-pack-size (2021-06-09) 1 commit
198
- (merged to 'next' on 2021-07-02 at b272fddb22)
199
- + doc: warn people against --max-pack-size
62
201
- Doc update.
63
+* ab/pickaxe-pcre2 (2021-05-11) 22 commits
64
+ (merged to 'next' on 2021-07-06 at fdb4fdc245)
65
+ + xdiff-interface: replace discard_hunk_line() with a flag
66
+ + xdiff users: use designated initializers for out_line
67
+ + pickaxe -G: don't special-case create/delete
68
+ + pickaxe -G: terminate early on matching lines
69
+ + xdiff-interface: allow early return from xdiff_emit_line_fn
70
+ + xdiff-interface: prepare for allowing early return
71
+ + pickaxe -S: slightly optimize contains()
72
+ + pickaxe: rename variables in has_changes() for brevity
73
+ + pickaxe -S: support content with NULs under --pickaxe-regex
74
+ + pickaxe: assert that we must have a needle under -G or -S
75
+ + pickaxe: refactor function selection in diffcore-pickaxe()
76
+ + perf: add performance test for pickaxe
77
+ + pickaxe/style: consolidate declarations and assignments
78
+ + diff.h: move pickaxe fields together again
79
+ + pickaxe: die when --find-object and --pickaxe-all are combined
80
+ + pickaxe: die when -G and --pickaxe-regex are combined
81
+ + pickaxe tests: add missing test for --no-pickaxe-regex being an error
82
+ + pickaxe tests: test for -G, -S and --find-object incompatibility
83
+ + pickaxe tests: add test for "log -S" not being a regex
84
+ + pickaxe tests: add test for diffgrep_consume() internals
85
+ + pickaxe tests: refactor to use test_commit --append --printf
86
+ + grep/pcre2 tests: reword comments referring to kwset
87
88
+ Rewrite the backend for "diff -G/-S" to use pcre2 engine when
89
+ available.
90
204
-* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
205
- (merged to 'next' on 2021-07-01 at 28f4da3e7d)
206
- + add_pending_object_with_path(): work around "gcc -O3" complaint
91
208
- Warning fix.
92
+* ab/pre-auto-gc-hook-test (2021-06-16) 1 commit
93
+ (merged to 'next' on 2021-07-06 at 305a15ee1d)
94
+ + gc tests: add a test for the "pre-auto-gc" hook
95
96
+ Test fix.
97
211
-* jk/test-avoid-globmatch-with-skip-patterns (2021-07-01) 1 commit
212
- (merged to 'next' on 2021-07-01 at 139fa916d1)
213
- + test-lib: avoid accidental globbing in match_pattern_list()
98
215
- We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
216
- update, which got fixed.
99
+* bk/doc-commit-typofix (2021-06-28) 1 commit
100
+ (merged to 'next' on 2021-07-06 at 88580c54ed)
101
+ + Documentation: fix typo in the --patch option of the commit command
102
103
+ Doc typo/grammo-fix.
104
219
-* jk/test-without-readlink-1 (2021-06-19) 1 commit
220
- (merged to 'next' on 2021-07-01 at fb3bf5a6b0)
221
- + t: use portable wrapper for readlink(1)
105
223
- Some test scripts assumed that readlink(1) was universally
224
- installed and available, which is not the case.
106
+* dc/p4-binary-submit-fix (2021-06-28) 1 commit
107
+ (merged to 'next' on 2021-07-06 at dec280fdc6)
108
+ + git-p4: fix failed submit by skip non-text data files
109
110
+ Prevent "git p4" from failing to submit changes to binary file.
111
227
-* js/no-more-multimail (2021-06-11) 1 commit
228
- (merged to 'next' on 2021-07-01 at ed7a4efc75)
229
- + multimail: stop shipping a copy
112
231
- Remove multimail from contrib/
113
+* fc/push-simple-updates (2021-06-02) 7 commits
114
+ (merged to 'next' on 2021-07-06 at 95c114f930)
115
+ + doc: push: explain default=simple correctly
116
+ + push: remove unused code in setup_push_upstream()
117
+ + push: simplify setup_push_simple()
118
+ + push: reorganize setup_push_simple()
119
+ + push: copy code to setup_push_simple()
120
+ + push: hedge code of default=simple
121
+ + push: rename !triangular to same_remote
122
+ (this branch is used by fc/push-simple-updates-cleanup.)
123
124
+ Some code and doc clarification around "git push".
125
234
-* js/stop-exporting-bogus-columns (2021-06-28) 1 commit
235
- (merged to 'next' on 2021-07-02 at 7674896d58)
236
- + pager: avoid setting COLUMNS when we're guessing its value
126
238
- When we cannot figure out how wide the terminal is, we use a
239
- fallback value of 80 ourselves (which cannot be avoided), but when
240
- we run the pager, we export it in COLUMNS, which forces the pager
241
- to use the hardcoded value, even when the pager is perfectly
242
- capable to figure it out itself. Stop exporting COLUMNS when we
243
- fall back on the hardcoded default value for our own use.
127
+* fc/push-simple-updates-cleanup (2021-06-02) 13 commits
128
+ (merged to 'next' on 2021-07-06 at da7fab5dc4)
129
+ + push: don't get a full remote object
130
+ + push: only check same_remote when needed
131
+ + push: remove trivial function
132
+ + push: remove redundant check
133
+ + push: factor out the typical case
134
+ + push: get rid of all the setup_push_* functions
135
+ + push: trivial simplifications
136
+ + push: make setup_push_* return the dst
137
+ + push: only get the branch when needed
138
+ + push: factor out null branch check
139
+ + push: split switch cases
140
+ + push: return immediately in trivial switch case
141
+ + push: create new get_upstream_ref() helper
142
+ (this branch uses fc/push-simple-updates.)
143
144
+ Some more code and doc clarification around "git push".
145
246
-* js/subtree-on-windows-fix (2021-06-15) 2 commits
247
- (merged to 'next' on 2021-07-01 at d4e4ccde63)
248
- + subtree: fix assumption about the directory separator
249
- + subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
146
251
- Update "git subtree" to work better on Windows.
147
+* hn/prep-tests-for-reftable (2021-06-02) 22 commits
148
+ (merged to 'next' on 2021-07-06 at 0d6f79d079)
149
+ + t1415: set REFFILES for test specific to storage format
150
+ + t4202: mark bogus head hash test with REFFILES
151
+ + t7003: check reflog existence only for REFFILES
152
+ + t7900: stop checking for loose refs
153
+ + t1404: mark tests that muck with .git directly as REFFILES.
154
+ + t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
155
+ + t1414: mark corruption test with REFFILES
156
+ + t1407: require REFFILES for for_each_reflog test
157
+ + test-lib: provide test prereq REFFILES
158
+ + t5304: use "reflog expire --all" to clear the reflog
159
+ + t5304: restyle: trim empty lines, drop ':' before >
160
+ + t7003: use rev-parse rather than FS inspection
161
+ + t5000: inspect HEAD using git-rev-parse
162
+ + t5000: reformat indentation to the latest fashion
163
+ + t1301: fix typo in error message
164
+ + t1413: use tar to save and restore entire .git directory
165
+ + t1401-symbolic-ref: avoid direct filesystem access
166
+ + t1401: use tar to snapshot and restore repo state
167
+ + t5601: read HEAD using rev-parse
168
+ + t9300: check ref existence using test-helper rather than a file system check
169
+ + t/helper/ref-store: initialize oid in resolve-ref
170
+ + t4202: split testcase for invalid HEAD symref and HEAD hash
171
172
+ Preliminary clean-up of tests before the main reftable changes
173
+ hits the codebase.
174
254
-* js/trace2-discard-event-docfix (2021-06-04) 1 commit
255
- (merged to 'next' on 2021-07-01 at 9fc3c6285e)
256
- + docs: fix api-trace2 doc for "too_many_files" event
175
258
- Docfix.
176
+* jk/union-merge-binary (2021-06-11) 3 commits
177
+ (merged to 'next' on 2021-07-06 at 5e77055895)
178
+ + ll_union_merge(): rename path_unused parameter
179
+ + ll_union_merge(): pass name labels to ll_xdl_merge()
180
+ + ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
181
182
+ The "union" conflict resolution variant misbehaved when used with
183
+ binary merge driver.
184
261
-* jv/userdiff-csharp-update (2021-06-16) 1 commit
262
- (merged to 'next' on 2021-07-01 at a2371d0580)
263
- + userdiff: add support for C# record types
185
265
- The userdiff pattern for C# learned the token "record".
186
+* mr/cmake (2021-06-11) 3 commits
187
+ (merged to 'next' on 2021-07-06 at efc86eb8fb)
188
+ + cmake: add warning for ignored MSGFMT_EXE
189
+ + cmake: create compile_commands.json by default
190
+ + cmake: add knob to disable vcpkg
191
192
+ CMake update.
193
268
-* jx/sideband-cleanup (2021-06-17) 4 commits
269
- (merged to 'next' on 2021-07-01 at 0eb604e8c2)
270
- + test: refactor to use "get_abbrev_oid" to get abbrev oid
271
- + test: refactor to use "test_commit" to create commits
272
- + test: compare raw output, not mangle tabs and spaces
273
- + sideband: don't lose clear-to-eol at packet boundary
194
275
- The side-band demultiplexer that is used to display progress output
276
- from the remote end did not clear the line properly when the end of
277
- line hits at a packet boundary, which has been corrected. Also
278
- comes with test clean-ups.
195
+* rs/grep-parser-fix (2021-06-30) 1 commit
196
+ (merged to 'next' on 2021-07-06 at 8c582fcd64)
197
+ + grep: report missing left operand of --and
198
199
+ "git grep --and -e foo" ought to have been diagnosed as an error
200
+ but instead segfaulted, which has been corrected.
201
281
-* jx/t6020-with-older-bash (2021-06-17) 1 commit
282
- (merged to 'next' on 2021-07-01 at 55d71ed779)
283
- + t6020: fix incompatible parameter expansion
202
285
- Work around inefficient glob substitution in older versions of bash
286
- by rewriting parts of a test.
203
+* zh/cat-file-batch-fix (2021-06-04) 2 commits
204
+ (merged to 'next' on 2021-07-01 at 28b788e905)
205
+ + cat-file: merge two block into one
206
+ + cat-file: handle trivial --batch format with --batch-all-objects
207
+ (this branch is used by zh/ref-filter-raw-data.)
208
209
+ "git cat-file --batch-all-objects"" misbehaved when "--batch" is in
210
+ use and did not ask for certain object traits.
211
289
-* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
290
- (merged to 'next' on 2021-07-02 at 5ca2515f34)
291
- + mergetools/kdiff3: make kdiff3 work on Windows too
212
+--------------------------------------------------
213
+[New Topics]
214
293
- On Windows, mergetool has been taught to find kdiff3.exe just like
294
- it finds winmerge.exe.
215
+* dl/packet-read-response-end-fix (2021-07-09) 1 commit
216
+ - pkt-line: replace "stateless separator" with "response end"
217
218
+ Error message update.
219
297
-* tb/complete-diff-anchored (2021-05-31) 1 commit
298
- (merged to 'next' on 2021-07-01 at 19878daaa9)
299
- + completion: add --anchored to diff's options
220
+ Will merge to 'next'.
221
301
- The command line completion (in contrib/) learned that "git diff"
302
- takes the "--anchored" option.
222
223
+* hj/commit-allow-empty-message (2021-07-09) 2 commits
224
+ - commit: remove irrelavent prompt on `--allow-empty-message`
225
+ - commit: reorganise commit hint strings
226
305
-* tk/partial-clone-repack-doc (2021-06-04) 1 commit
306
- (merged to 'next' on 2021-07-01 at fe4c6280bc)
307
- + Remove warning that repack only works on non-promisor packfiles
227
+ "git commit --allow-empty-message" won't abort the operation upon
228
+ an empty message, but the hint shown in the editor said otherwise.
229
309
- Docfix.
230
+ Will merge to 'next'.
231
311
---------------------------------------------------
312
-[New Topics]
232
314
-* ab/gitignore-discovery-doc (2021-07-06) 1 commit
315
- - docs: .gitignore parsing is to the top of the repo
233
+* ab/attribute-format (2021-07-13) 6 commits
234
+ - strbuf.h: add a comment about "missing" strftime() checking
235
+ - advice.h: add missing __attribute__((format)) & fix usage
236
+ - *.h: add a few missing __attribute__((format))
237
+ - *.c static functions: add missing __attribute__((format))
238
+ - sequencer.c: move static function to avoid forward decl
239
+ - *.c static functions: don't forward-declare __attribute__
240
317
- Doc update.
241
+ Many "printf"-like helper functions we have have been annotated
242
+ with __attribute__() to catch placeholder/parameter mismatches.
243
244
Will merge to 'next'.
245
246
322
-* bc/rev-list-without-commit-line (2021-07-06) 1 commit
323
- - rev-list: add option for --pretty without header
247
+* dl/diff-merge-base (2021-07-12) 1 commit
248
+ - git-diff: fix missing --merge-base docs
249
325
- "git rev-list" learns to omit the "commit <object-name>" header
326
- lines from the output with the `--no-commit-header` option.
250
+ "git diff --merge-base" documentation has been updated.
251
252
Will merge to 'next'.
253
254
331
-* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
332
- - imap-send.c: use less verbose strbuf_fread() idiom
255
+* en/rename-limits-doc (2021-07-12) 3 commits
256
+ - diff: correct warning message when renameLimit exceeded
257
+ - doc: document the special handling of -l0
258
+ - doc: clarify documentation for rename/copy limits
259
334
- Code simplification.
335
-
336
- Will merge to 'next'.
260
+ Update documentation on "git diff -l<n>" and diff.renameLimit.
261
262
+ Expecting a reroll.
263
+ cf. <c25e29a9-3a15-4079-43fd-b77746927b16@gmail.com>
264
+ cf. <CAPig+cTFoLaUd8+VRsaJuP24C7fnbTTFx0i7PizyasES7K2jdg@mail.gmail.com>
265
+ cf. <CABPp-BHF3Os7fOeaF_EQOo+Bs7f1DXbYr26WmAQrPjv63nq1Pg@mail.gmail.com>
266
339
-* ab/pkt-line-tests (2021-07-07) 5 commits
340
- - test-lib-functions.sh: remove unused [de]packetize() functions
341
- - tests: replace remaining packetize() with "test-tool pkt-line"
342
- - tests: replace [de]packetize() shell+perl test-tool pkt-line
343
- - serve tests: use test_cmp in "protocol violations" test
344
- - serve tests: add missing "extra delim" test
267
346
- Update tests to cover a bit more protocol bits and unify two
347
- similar test helpers into one.
268
+* jk/typofix (2021-07-13) 1 commit
269
+ (merged to 'next' on 2021-07-13 at cce3caa34e)
270
+ + doc/rev-list-options: fix duplicate word typo
271
349
- Will merge to 'next'.
272
+ Typofix.
273
274
+ Will merge to 'master'.
275
276
--------------------------------------------------
277
[Stalled]
@@ -408,6 +332,48 @@ Release tarballs are available at:
332
--------------------------------------------------
333
[Cooking]
334
335
+* ab/gitignore-discovery-doc (2021-07-06) 1 commit
336
+ (merged to 'next' on 2021-07-13 at 02f3b3deab)
337
+ + docs: .gitignore parsing is to the top of the repo
338
+
339
+ Doc update.
340
+
341
+ Will merge to 'master'.
342
+
343
+
344
+* bc/rev-list-without-commit-line (2021-07-12) 1 commit
345
+ (merged to 'next' on 2021-07-13 at 1ceed60061)
346
+ + rev-list: add option for --pretty=format without header
347
+
348
+ "git rev-list" learns to omit the "commit <object-name>" header
349
+ lines from the output with the `--no-commit-header` option.
350
+
351
+ Will merge to 'master'.
352
+
353
+
354
+* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
355
+ (merged to 'next' on 2021-07-13 at ab59128bfb)
356
+ + imap-send.c: use less verbose strbuf_fread() idiom
357
+
358
+ Code simplification.
359
+
360
+ Will merge to 'master'.
361
+
362
+
363
+* ab/pkt-line-tests (2021-07-12) 5 commits
364
+ - test-lib-functions.sh: remove unused [de]packetize() functions
365
+ - tests: replace remaining packetize() with "test-tool pkt-line"
366
+ - tests: replace [de]packetize() shell+perl test-tool pkt-line
367
+ - serve tests: use test_cmp in "protocol violations" test
368
+ - serve tests: add missing "extra delim" test
369
+
370
+ Update tests to cover a bit more protocol bits and unify two
371
+ similar test helpers into one.
372
+
373
+ Expecting a reroll for a couple of small "correctness" things...
374
+ cf.<YO3+3F5fRONVtqTI@coredump.intra.peff.net>
375
+
376
+
377
* ab/lib-subtest (2021-07-01) 8 commits
378
- test-lib tests: assert 1 exit code, not non-zero
379
- test-lib tests: refactor common part of check_sub_test_lib_test*()
@@ -420,19 +386,20 @@ Release tarballs are available at:
386
387
Refactor tests on test framework.
388
423
- What's the review status of this thing?
389
+ Needs review.
390
391
392
* ab/struct-init (2021-07-01) 5 commits
427
- - string-list.h users: change to use *_{nodup,dup}()
428
- - string-list.[ch]: add a string_list_init_{nodup,dup}()
429
- - dir.[ch]: replace dir_init() with DIR_INIT
430
- - *.c *_init(): define in terms of corresponding *_INIT macro
431
- - *.h: move some *_INIT to designated initializers
393
+ (merged to 'next' on 2021-07-09 at 8aec33fe39)
394
+ + string-list.h users: change to use *_{nodup,dup}()
395
+ + string-list.[ch]: add a string_list_init_{nodup,dup}()
396
+ + dir.[ch]: replace dir_init() with DIR_INIT
397
+ + *.c *_init(): define in terms of corresponding *_INIT macro
398
+ + *.h: move some *_INIT to designated initializers
399
400
Code cleanup around struct_type_init() functions.
401
435
- Will merge to 'next'.
402
+ Will merge to 'master'.
403
404
405
* bc/inactive-submodules (2021-07-02) 1 commit
@@ -442,9 +409,10 @@ Release tarballs are available at:
409
410
Under review.
411
cf. <fc5ec100-1d42-4199-236e-7a99c9218f38@gmail.com>
412
+ cf. <bf1893ee-6973-d8b2-659e-bb239a0a9ae2@gmail.com>
413
414
447
-* en/ort-perf-batch-14 (2021-07-01) 7 commits
415
+* en/ort-perf-batch-14 (2021-07-13) 7 commits
416
- merge-ort: restart merge with cached renames to reduce process entry cost
417
- merge-ort: avoid recursing into directories when we don't need to
418
- merge-ort: defer recursing into directories when merge base is matched
@@ -459,19 +427,21 @@ Release tarballs are available at:
427
428
429
* ar/help-micro-cleanup (2021-07-06) 1 commit
462
- - help: convert git_cmd to page in one place
430
+ (merged to 'next' on 2021-07-09 at d8e428c6fd)
431
+ + help: convert git_cmd to page in one place
432
433
Tiny code clean-up.
434
466
- Will merge to 'next'.
435
+ Will merge to 'master'.
436
437
438
* ar/submodule-helper-include-cleanup (2021-07-06) 1 commit
470
- - submodule--helper: remove redundant include
439
+ (merged to 'next' on 2021-07-09 at 7e1d15fb86)
440
+ + submodule--helper: remove redundant include
441
442
Code clean-up.
443
474
- Will merge to 'next'.
444
+ Will merge to 'master'.
445
446
447
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
@@ -484,13 +454,14 @@ Release tarballs are available at:
454
455
456
* dd/test-stdout-count-lines (2021-07-06) 3 commits
487
- - t6402: preserve git exit status code
488
- - t6400: preserve git ls-files exit status code
489
- - test-lib-functions: introduce test_stdout_line_count
457
+ (merged to 'next' on 2021-07-09 at 19200fa2e0)
458
+ + t6402: preserve git exit status code
459
+ + t6400: preserve git ls-files exit status code
460
+ + test-lib-functions: introduce test_stdout_line_count
461
462
Tiny test clean-up.
463
493
- Will merge to 'next'.
464
+ Will merge to 'master'.
465
466
467
* hn/refs-iterator-peel-returns-boolean (2021-05-20) 1 commit
@@ -504,12 +475,13 @@ Release tarballs are available at:
475
476
477
* hn/refs-test-cleanup (2021-07-06) 2 commits
507
- - t7509: avoid direct file access for writing CHERRY_PICK_HEAD
508
- - t1415: avoid direct filesystem access for writing refs
478
+ (merged to 'next' on 2021-07-09 at ae08de6afc)
479
+ + t7509: avoid direct file access for writing CHERRY_PICK_HEAD
480
+ + t1415: avoid direct filesystem access for writing refs
481
482
Test clean-up.
483
512
- Will merge to 'next'.
484
+ Will merge to 'master'.
485
486
487
* ps/perf-with-separate-output-directory (2021-07-02) 1 commit
@@ -521,24 +493,23 @@ Release tarballs are available at:
493
494
495
* rs/khash-alloc-cleanup (2021-07-06) 1 commit
524
- - khash: clarify that allocations never fail
496
+ (merged to 'next' on 2021-07-09 at a01d1bb8c9)
497
+ + khash: clarify that allocations never fail
498
499
Code clean-up.
500
528
- Will merge to 'next'.
501
+ Will merge to 'master'.
502
503
531
-* sm/worktree-add-lock (2021-07-08) 3 commits
504
+* sm/worktree-add-lock (2021-07-12) 3 commits
505
- worktree: teach `add` to accept --reason <string> with --lock
533
- - worktree: default lock string should be marked with `_()` for translation
534
- - t2400: remove unneeded `git rev-parse` from '"add" worktree with lock' test
506
+ - worktree: mark lock strings with `_()` for translation
507
+ - t2400: clean up '"add" worktree with lock' test
508
509
"git worktree add --lock" learned to record why the worktree is
510
locked with a custom message.
511
539
- Expecting a reroll?
540
- cf. <pull.992.v2.git.1625759443.gitgitgadget@gmail.com>
541
- cf. <CAPig+cSsPrQrP9xk8M8H339_NpYqKh1okeo1V-fAJ2zk3QeOjQ@mail.gmail.com>
512
+ Ready?
513
514
515
* ab/bundle-doc (2021-07-02) 3 commits
@@ -552,36 +523,18 @@ Release tarballs are available at:
523
at least for the second patch.
524
525
555
-* ab/pack-stdin-packs-fix (2021-06-28) 2 commits
526
+* ab/pack-stdin-packs-fix (2021-07-09) 2 commits
527
- pack-objects: fix segfault in --stdin-packs option
528
- pack-objects tests: cover blindspots in stdin handling
529
530
Input validation of "git pack-objects --stdin-packs" has been
531
corrected.
532
562
- Expecting a reroll.
533
+ Ack?
534
cf. <YND3h2l10PlnSNGJ@nand.local>
535
536
566
-* bk/doc-commit-typofix (2021-06-28) 1 commit
567
- (merged to 'next' on 2021-07-06 at 88580c54ed)
568
- + Documentation: fix typo in the --patch option of the commit command
569
-
570
- Doc typo/grammo-fix.
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* dc/p4-binary-submit-fix (2021-06-28) 1 commit
576
- (merged to 'next' on 2021-07-06 at dec280fdc6)
577
- + git-p4: fix failed submit by skip non-text data files
578
-
579
- Prevent "git p4" from failing to submit changes to binary file.
580
-
581
- Will merge to 'master'.
582
-
583
-
584
-* ds/commit-and-checkout-with-sparse-index (2021-06-28) 5 commits
537
+* ds/commit-and-checkout-with-sparse-index (2021-07-12) 5 commits
538
- checkout: stop expanding sparse indexes
539
- sparse-index: recompute cache-tree
540
- commit: integrate with sparse-index
@@ -592,7 +545,7 @@ Release tarballs are available at:
545
"git checkout" and "git commit" learn to work without unnecessarily
546
expanding sparse indexes.
547
595
- Comments?
548
+ Ready?
549
550
551
* en/merge-dir-rename-corner-case-fix (2021-06-30) 3 commits
@@ -619,7 +572,8 @@ Release tarballs are available at:
572
Will merge to 'next'?
573
574
622
-* jk/log-decorate-optim (2021-06-28) 6 commits
575
+* jk/log-decorate-optim (2021-07-13) 7 commits
576
+ - load_ref_decorations(): fix decoration with tags
577
(merged to 'next' on 2021-07-08 at a3b6f978ab)
578
+ add_ref_decoration(): rename s/type/deco_type/
579
+ load_ref_decorations(): avoid parsing non-tag objects
@@ -631,21 +585,22 @@ Release tarballs are available at:
585
Optimize "git log" for cases where we wasted cycles to load ref
586
decoration data that may not be needed.
587
634
- Will merge to 'master'.
588
+ Will merge to 'next'.
589
590
591
* js/ci-windows-update (2021-07-06) 7 commits
638
- - ci: accelerate the checkout
639
- - ci (vs-build): build with NO_GETTEXT
640
- - artifacts-tar: respect NO_GETTEXT
641
- - ci (windows): transfer also the Git-tracked files to the test jobs
642
- - ci: upgrade to using actions/{up,down}load-artifacts v2
643
- - ci (vs-build): use `cmd` to copy the DLLs, not `powershell`
644
- - ci: use the new GitHub Action to download git-sdk-64-minimal
592
+ (merged to 'next' on 2021-07-13 at 329771e960)
593
+ + ci: accelerate the checkout
594
+ + ci (vs-build): build with NO_GETTEXT
595
+ + artifacts-tar: respect NO_GETTEXT
596
+ + ci (windows): transfer also the Git-tracked files to the test jobs
597
+ + ci: upgrade to using actions/{up,down}load-artifacts v2
598
+ + ci (vs-build): use `cmd` to copy the DLLs, not `powershell`
599
+ + ci: use the new GitHub Action to download git-sdk-64-minimal
600
601
GitHub Actions / CI update.
602
648
- Will merge to 'next'.
603
+ Will merge to 'master'.
604
605
606
* js/config-mak-windows-pcre-fix (2021-06-28) 1 commit
@@ -676,7 +631,7 @@ Release tarballs are available at:
631
Bugfix for common ancestor negotiation recently introduced in "git
632
push" codepath.
633
679
- Comments?
634
+ Needs review.
635
636
637
* ks/submodule-cleanup (2021-06-28) 1 commit
@@ -688,16 +643,6 @@ Release tarballs are available at:
643
Will merge to 'master'.
644
645
691
-* rs/grep-parser-fix (2021-06-30) 1 commit
692
- (merged to 'next' on 2021-07-06 at 8c582fcd64)
693
- + grep: report missing left operand of --and
694
-
695
- "git grep --and -e foo" ought to have been diagnosed as an error
696
- but instead segfaulted, which has been corrected.
697
-
698
- Will merge to 'master'.
699
-
700
-
646
* tb/midx-use-checksum (2021-06-28) 4 commits
647
(merged to 'next' on 2021-07-08 at bbaac9c721)
648
+ midx: report checksum mismatches during 'verify'
@@ -801,14 +746,13 @@ Release tarballs are available at:
746
Comments?
747
748
804
-* ds/status-with-sparse-index (2021-06-28) 16 commits
749
+* ds/status-with-sparse-index (2021-07-12) 15 commits
750
- fsmonitor: integrate with sparse index
751
- wt-status: expand added sparse directory entries
752
- status: use sparse-index throughout
753
- status: skip sparse-checkout percentage with sparse-index
754
- diff-lib: handle index diffs with sparse dirs
755
- dir.c: accept a directory as part of cone-mode patterns
811
- - unpack-trees: handle dir/file conflict of sparse entries
756
- unpack-trees: unpack sparse directory entries
757
- unpack-trees: rename unpack_nondirectories()
758
- unpack-trees: compare sparse directories correctly
@@ -823,51 +767,8 @@ Release tarballs are available at:
767
"git status" codepath learned to work with sparsely populated index
768
without hydrating it fully.
769
826
- Will merge to 'next'?
827
-
828
-
829
-* ab/describe-tests-fix (2021-05-11) 5 commits
830
- (merged to 'next' on 2021-07-06 at ba1f7c0364)
831
- + describe tests: support -C in "check_describe"
832
- + describe tests: fix nested "test_expect_success" call
833
- + describe tests: don't rely on err.actual from "check_describe"
834
- + describe tests: refactor away from glob matching
835
- + describe tests: improve test for --work-tree & --dirty
836
-
837
- Various updates to tests around "git describe"
838
-
839
- Will merge to 'master'.
840
-
841
-
842
-* ab/pickaxe-pcre2 (2021-05-11) 22 commits
843
- (merged to 'next' on 2021-07-06 at fdb4fdc245)
844
- + xdiff-interface: replace discard_hunk_line() with a flag
845
- + xdiff users: use designated initializers for out_line
846
- + pickaxe -G: don't special-case create/delete
847
- + pickaxe -G: terminate early on matching lines
848
- + xdiff-interface: allow early return from xdiff_emit_line_fn
849
- + xdiff-interface: prepare for allowing early return
850
- + pickaxe -S: slightly optimize contains()
851
- + pickaxe: rename variables in has_changes() for brevity
852
- + pickaxe -S: support content with NULs under --pickaxe-regex
853
- + pickaxe: assert that we must have a needle under -G or -S
854
- + pickaxe: refactor function selection in diffcore-pickaxe()
855
- + perf: add performance test for pickaxe
856
- + pickaxe/style: consolidate declarations and assignments
857
- + diff.h: move pickaxe fields together again
858
- + pickaxe: die when --find-object and --pickaxe-all are combined
859
- + pickaxe: die when -G and --pickaxe-regex are combined
860
- + pickaxe tests: add missing test for --no-pickaxe-regex being an error
861
- + pickaxe tests: test for -G, -S and --find-object incompatibility
862
- + pickaxe tests: add test for "log -S" not being a regex
863
- + pickaxe tests: add test for diffgrep_consume() internals
864
- + pickaxe tests: refactor to use test_commit --append --printf
865
- + grep/pcre2 tests: reword comments referring to kwset
866
-
867
- Rewrite the backend for "diff -G/-S" to use pcre2 engine when
868
- available.
869
-
870
- Will merge to 'master'.
770
+ Expecting a final reroll.
771
+ cf. <e7199fc6-bc7b-f556-c10c-12dee04af287@gmail.com>
772
773
774
* ab/config-based-hooks-base (2021-06-29) 33 commits
@@ -929,15 +830,6 @@ Release tarballs are available at:
830
that do not call for Eve).
831
832
932
-* ab/pre-auto-gc-hook-test (2021-06-16) 1 commit
933
- (merged to 'next' on 2021-07-06 at 305a15ee1d)
934
- + gc tests: add a test for the "pre-auto-gc" hook
935
-
936
- Test fix.
937
-
938
- Will merge to 'master'.
939
-
940
-
833
* en/ort-perf-batch-13 (2021-06-28) 5 commits
834
(merged to 'next' on 2021-07-08 at 39aad121d3)
835
+ merge-ort: add prefetching for content merges
@@ -963,32 +855,22 @@ Release tarballs are available at:
855
856
Code clean-up around "git serve".
857
966
- Comments?
967
-
968
-
969
-* jk/union-merge-binary (2021-06-11) 3 commits
970
- (merged to 'next' on 2021-07-06 at 5e77055895)
971
- + ll_union_merge(): rename path_unused parameter
972
- + ll_union_merge(): pass name labels to ll_xdl_merge()
973
- + ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
974
-
975
- The "union" conflict resultion variant misbehaved when used with
976
- binary merge driver.
977
-
978
- Will merge to 'master'.
858
+ Expecting a reroll.
859
+ cf. <cover-0.8-00000000000-20210628T191634Z-avarab@gmail.com>
860
861
862
* jt/partial-clone-submodule-1 (2021-06-28) 5 commits
982
- - promisor-remote: teach lazy-fetch in any repo
983
- - run-command: refactor subprocess env preparation
984
- - submodule: refrain from filtering GIT_CONFIG_COUNT
985
- - promisor-remote: support per-repository config
986
- - repository: move global r_f_p_c to repo struct
863
+ (merged to 'next' on 2021-07-09 at 2bc8c2c4dd)
864
+ + promisor-remote: teach lazy-fetch in any repo
865
+ + run-command: refactor subprocess env preparation
866
+ + submodule: refrain from filtering GIT_CONFIG_COUNT
867
+ + promisor-remote: support per-repository config
868
+ + repository: move global r_f_p_c to repo struct
869
870
Prepare the internals for lazily fetching objects in submodules
871
from their promisor remotes.
872
991
- Will merge to 'next'.
873
+ Will merge to 'master'.
874
875
876
* ab/mktag-tests (2021-06-28) 6 commits
@@ -1070,7 +952,8 @@ Release tarballs are available at:
952
Futz with the way 'errno' is relied on in the refs API to carry the
953
failure modes up the callchain.
954
1073
- Will merge to 'next'.
955
+ Expecting a (hopefully final) reroll.
956
+ cf. <CAFQ2z_NzykfcBSvtHQ10RZWxLP48+qArZk9HbDJQB4tNX-GtYA@mail.gmail.com>
957
958
959
* ab/test-tool-cache-cleanup (2021-06-08) 4 commits
@@ -1084,16 +967,17 @@ Release tarballs are available at:
967
Waiting for reviews.
968
969
1087
-* ab/pack-objects-stdin (2021-06-28) 4 commits
970
+* ab/pack-objects-stdin (2021-07-09) 5 commits
971
- pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
972
- pack-objects.c: do stdin parsing via revision.c's API
973
+ - revision.[ch]: add a "handle_stdin_line" API
974
- revision.h: refactor "disable_stdin" and "read_from_stdin"
975
- upload-pack: run is_repository_shallow() before setup_revisions()
976
1093
- Code clean-up.
977
+ Introduce handle_stdin_line callback to revision API and uses it.
978
979
1096
-* ar/submodule-add (2021-07-08) 4 commits
980
+* ar/submodule-add (2021-07-12) 4 commits
981
- submodule--helper: introduce add-clone subcommand
982
- submodule--helper: refactor module_clone()
983
- submodule: prefix die messages with 'fatal'
@@ -1105,15 +989,16 @@ Release tarballs are available at:
989
990
991
* ds/gender-neutral-doc (2021-06-16) 3 commits
1108
- - *: fix typos
1109
- - comments: avoid using the gender of our users
1110
- - doc: avoid using the gender of other people
992
+ (merged to 'next' on 2021-07-09 at 57bb445576)
993
+ + *: fix typos
994
+ + comments: avoid using the gender of our users
995
+ + doc: avoid using the gender of other people
996
(this branch is used by ds/gender-neutral-doc-guidelines.)
997
998
Update the documentation not to assume users are of certain gender
999
and adds to guidelines to do so.
1000
1116
- Will merge to 'next'.
1001
+ Will merge to 'master'.
1002
1003
1004
* ds/gender-neutral-doc-guidelines (2021-06-16) 2 commits
@@ -1121,7 +1006,7 @@ Release tarballs are available at:
1006
- CodingGuidelines: recommend singular they
1007
(this branch uses ds/gender-neutral-doc.)
1008
1124
- Attempt to give a guideline for gender neutral documentation.
1009
+ Attempt to give a guideline for gender neutral documentation.
1010
1011
Comments?
1012
@@ -1158,17 +1043,6 @@ Release tarballs are available at:
1043
cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
1044
1045
1161
-* mr/cmake (2021-06-11) 3 commits
1162
- (merged to 'next' on 2021-07-06 at efc86eb8fb)
1163
- + cmake: add warning for ignored MSGFMT_EXE
1164
- + cmake: create compile_commands.json by default
1165
- + cmake: add knob to disable vcpkg
1166
-
1167
- CMake update.
1168
-
1169
- Will merge to 'master'.
1170
-
1171
-
1046
* ab/update-submitting-patches (2021-06-08) 3 commits
1047
- SubmittingPatches: remove pine-specific hints from MUA hints
1048
- SubmittingPatches: replace discussion of Travis with GitHub Actions
@@ -1181,87 +1055,6 @@ Release tarballs are available at:
1055
cf. <nycvar.QRO.7.76.6.2106072346560.55@tvgsbejvaqbjf.bet>
1056
1057
1184
-* hn/prep-tests-for-reftable (2021-06-02) 22 commits
1185
- (merged to 'next' on 2021-07-06 at 0d6f79d079)
1186
- + t1415: set REFFILES for test specific to storage format
1187
- + t4202: mark bogus head hash test with REFFILES
1188
- + t7003: check reflog existence only for REFFILES
1189
- + t7900: stop checking for loose refs
1190
- + t1404: mark tests that muck with .git directly as REFFILES.
1191
- + t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
1192
- + t1414: mark corruption test with REFFILES
1193
- + t1407: require REFFILES for for_each_reflog test
1194
- + test-lib: provide test prereq REFFILES
1195
- + t5304: use "reflog expire --all" to clear the reflog
1196
- + t5304: restyle: trim empty lines, drop ':' before >
1197
- + t7003: use rev-parse rather than FS inspection
1198
- + t5000: inspect HEAD using git-rev-parse
1199
- + t5000: reformat indentation to the latest fashion
1200
- + t1301: fix typo in error message
1201
- + t1413: use tar to save and restore entire .git directory
1202
- + t1401-symbolic-ref: avoid direct filesystem access
1203
- + t1401: use tar to snapshot and restore repo state
1204
- + t5601: read HEAD using rev-parse
1205
- + t9300: check ref existence using test-helper rather than a file system check
1206
- + t/helper/ref-store: initialize oid in resolve-ref
1207
- + t4202: split testcase for invalid HEAD symref and HEAD hash
1208
-
1209
- Preliminary clean-up of tests before the main reftable changes
1210
- hits the codebase.
1211
-
1212
- Will merge to 'master'.
1213
-
1214
-
1215
-* zh/cat-file-batch-fix (2021-06-04) 2 commits
1216
- (merged to 'next' on 2021-07-01 at 28b788e905)
1217
- + cat-file: merge two block into one
1218
- + cat-file: handle trivial --batch format with --batch-all-objects
1219
- (this branch is used by zh/ref-filter-raw-data.)
1220
-
1221
- "git cat-file --batch-all-objects"" misbehaved when "--batch" is in
1222
- use and did not ask for certain object traits.
1223
-
1224
- Will merge to 'master'.
1225
-
1226
-
1227
-* fc/push-simple-updates (2021-06-02) 7 commits
1228
- (merged to 'next' on 2021-07-06 at 95c114f930)
1229
- + doc: push: explain default=simple correctly
1230
- + push: remove unused code in setup_push_upstream()
1231
- + push: simplify setup_push_simple()
1232
- + push: reorganize setup_push_simple()
1233
- + push: copy code to setup_push_simple()
1234
- + push: hedge code of default=simple
1235
- + push: rename !triangular to same_remote
1236
- (this branch is used by fc/push-simple-updates-cleanup.)
1237
-
1238
- Some code and doc clarification around "git push".
1239
-
1240
- Will merge to 'master'.
1241
-
1242
-
1243
-* fc/push-simple-updates-cleanup (2021-06-02) 13 commits
1244
- (merged to 'next' on 2021-07-06 at da7fab5dc4)
1245
- + push: don't get a full remote object
1246
- + push: only check same_remote when needed
1247
- + push: remove trivial function
1248
- + push: remove redundant check
1249
- + push: factor out the typical case
1250
- + push: get rid of all the setup_push_* functions
1251
- + push: trivial simplifications
1252
- + push: make setup_push_* return the dst
1253
- + push: only get the branch when needed
1254
- + push: factor out null branch check
1255
- + push: split switch cases
1256
- + push: return immediately in trivial switch case
1257
- + push: create new get_upstream_ref() helper
1258
- (this branch uses fc/push-simple-updates.)
1259
-
1260
- Some more code and doc clarification around "git push".
1261
-
1262
- Will merge to 'master'.
1263
-
1264
-
1058
* en/ort-perf-batch-12 (2021-06-09) 4 commits
1059
(merged to 'next' on 2021-07-08 at 4807694598)
1060
+ merge-ort: miscellaneous touch-ups
@@ -1274,7 +1067,9 @@ Release tarballs are available at:
1067
Will merge to 'master'.
1068
1069
1277
-* zh/ref-filter-raw-data (2021-07-01) 16 commits
1070
+* zh/ref-filter-raw-data (2021-07-12) 18 commits
1071
+ - cat-file: use fast path when using default_format
1072
+ - cat-file: create p1006-cat-file.sh
1073
- ref-filter: remove grab_oid() function
1074
- cat-file: re-implement --textconv, --filters options
1075
- cat-file: reuse err buf in batch_object_write()
@@ -1282,7 +1077,7 @@ Release tarballs are available at:
1077
- cat-file: change batch_objects parameter name
1078
- cat-file: add has_object_file() check
1079
- ref-filter: modify the error message and value in get_object
1285
- - ref-filter: add cat_file_mode in struct ref_format
1080
+ - ref-filter: introduce reject_atom()
1081
- ref-filter: introduce free_ref_array_item_value() function
1082
- ref-filter: pass get_object() return value to their callers
1083
- ref-filter: add %(rest) atom
@@ -1291,7 +1086,6 @@ Release tarballs are available at:
1086
- ref-filter: add %(raw) atom
1087
- ref-filter: add obj-type check in grab contents
1088
- Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
1294
- (this branch uses zh/cat-file-batch-fix.)
1089
1090
Prepare the "ref-filter" machinery that drives the "--format"
1091
option of "git for-each-ref" and its friends to be used in "git
@@ -1300,7 +1094,8 @@ Release tarballs are available at:
1094
Heavy performance degradation has been observed with this series.
1095
1096
1303
-* jh/builtin-fsmonitor (2021-07-01) 34 commits
1097
+* jh/builtin-fsmonitor (2021-07-12) 35 commits
1098
+ - BANDAID: sparse fixes
1099
- t7527: test FS event reporing on MacOS WRT case and Unicode
1100
- fsmonitor: handle shortname for .git
1101
- t7527: test status with untracked-cache and fsmonitor--daemon
@@ -1339,8 +1134,6 @@ Release tarballs are available at:
1134
An attempt to write and ship with a watchman equivalent tailored
1135
for our use.
1136
1342
- Will merge to 'next'.
1343
-
1137
1138
* es/trace2-log-parent-process-name (2021-06-09) 1 commit
1139
- tr2: log parent process name
@@ -1373,7 +1166,7 @@ Release tarballs are available at:
1166
Will merge to 'master'.
1167
1168
1376
-* ab/fsck-unexpected-type (2021-06-28) 21 commits
1169
+* ab/fsck-unexpected-type (2021-07-12) 21 commits
1170
- fsck: report invalid object type-path combinations
1171
- fsck: report invalid types recorded in objects
1172
- object-store.h: move read_loose_object() below 'struct object_info'