What's cooking (2022/08 #07)
Junio C Hamano committed
Aug 19, 2022 at 17:19 UTC
66484ac8d6b5eebe5f706130b00f5c0f64d6afdf
1 file changed
+267
-207
whats-cooking.txt
+267
-207
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #06; Wed, 17)
3
-X-master-at: 9bf691b78cf906751e65d65ba0c6ffdcd9a5a12c
4
-X-next-at: 91fe8e635439f67be8837601cbf4bd61eddc41b4
2
+Subject: What's cooking in git.git (Aug 2022, #07; Fri, 19)
3
+X-master-at: 795ea8776befc95ea2becd8020c7a284677b4161
4
+X-next-at: 83af4878235c0b991658350560d398d4e8edb8a9
5
6
-What's cooking in git.git (Aug 2022, #06; Wed, 17)
6
+What's cooking in git.git (Aug 2022, #07; Fri, 19)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,7 +13,7 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
13
considered "accepted" at all. A topic without enough support may be
14
discarded after a long period of no activity.
15
16
-We are in the middle of the week #6 of a 12-week cycle (cf.
16
+We are at the end of the week #6 of a 12-week cycle (cf.
17
https://tinyurl.com/gitCal).
18
19
Copies of the source code to Git live in many repositories, and the
@@ -47,46 +47,147 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[New Topics]
49
50
-* vd/scalar-enables-fsmonitor (2022-08-16) 5 commits
51
- - scalar: update technical doc roadmap with FSMonitor support
52
- - scalar unregister: stop FSMonitor daemon
53
- - scalar: enable built-in FSMonitor on `register`
54
- - scalar-[un]register: clearly indicate source of error
55
- - scalar-unregister: handle error codes greater than 0
50
+* en/ort-unused-code-removal (2022-08-19) 1 commit
51
+ - merge-ort: remove code obsoleted by other changes
52
57
- "scalar" now enables built-in fsmonitor on enlisted repositories,
58
- when able.
53
+ Code clean-up.
54
55
Will merge to 'next'?
61
- source: <pull.1324.v2.git.1660694290.gitgitgadget@gmail.com>
56
+ source: <pull.1302.git.git.1660884355643.gitgitgadget@gmail.com>
57
58
64
-* en/ancestry-path-in-a-range (2022-08-17) 2 commits
65
- - revision: allow --ancestry-path to take an argument
66
- - rev-list-options.txt: fix simple typo
59
+* jd/prompt-show-conflict (2022-08-19) 1 commit
60
+ (merged to 'next' on 2022-08-19 at 83af487823)
61
+ + git-prompt: show presence of unresolved conflicts at command prompt
62
68
- "git rev-list --ancestry-path=C A..B" is a natural extension of
69
- "git rev-list A..B"; instead of choosing a subset of A..B to those
70
- that have ancestry relationship with A, it lets a subset with
71
- ancestry relationship with C.
63
+ The bash prompt (in contrib/) learned to optionally indicate when
64
+ the index is unmerged.
65
73
- Will merge to 'next'?
74
- source: <pull.1303.git.1660704498.gitgitgadget@gmail.com>
66
+ Will merge to 'master'.
67
+ source: <pull.1302.v3.git.1660695492382.gitgitgadget@gmail.com>
68
69
77
-* en/submodule-merge-messages-fixes (2022-08-17) 3 commits
78
- - merge-ort: provide helpful submodule update message when possible
79
- - merge-ort: add comment to avoid surprise with new sub_flag variable
80
- - merge-ort: remove translator lego in new "submodule conflict suggestion"
81
- (this branch uses cw/submodule-merge-messages.)
70
+* jk/unused-annotation (2022-08-19) 11 commits
71
+ - is_path_owned_by_current_uid(): mark "report" parameter as unused
72
+ - run-command: mark unused async callback parameters
73
+ - mark unused read_tree_recursive() callback parameters
74
+ - hashmap: mark unused callback parameters
75
+ - config: mark unused callback parameters
76
+ - streaming: mark unused virtual method parameters
77
+ - transport: mark bundle transport_options as unused
78
+ - refs: mark unused virtual method parameters
79
+ - refs: mark unused reflog callback parameters
80
+ - refs: mark unused each_ref_fn parameters
81
+ - git-compat-util: add UNUSED macro
82
83
- Further update the help messages given while merging submodules.
83
+ Annotate function parameters that are not used (but cannot be
84
+ removed for structural reasons), to prepare us to later compile
85
+ with -Wunused warning turned on.
86
85
- Will merge to 'next'?
86
- source: <pull.1325.v2.git.1660718028.gitgitgadget@gmail.com>
87
+ Will merge to 'next'.
88
+ source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
89
+
90
+
91
+* jk/unused-fixes (2022-08-19) 6 commits
92
+ - reflog: assert PARSE_OPT_NONEG in parse-options callbacks
93
+ - reftable: drop unused parameter from reader_seek_linear()
94
+ - verify_one_sparse(): drop unused repository parameter
95
+ - match_pathname(): drop unused "flags" parameter
96
+ - log-tree: drop unused commit param in remerge_diff()
97
+ - xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
98
+
99
+ Code clean-up to remove unused function parameters.
100
+
101
+ Will merge to 'next'.
102
+ source: <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
103
+
104
+
105
+* js/merge-tree-without-munging-filenames (2022-08-19) 3 commits
106
+ - t4301: add a test case involving a rename, type change & modification
107
+ - merge-tree: show the original file names in the conflict output
108
+ - merge-tree -z: always show the original file name first
109
+
110
+ "git merge-tree" output was improved to help "merging without
111
+ working tree" usecase better in a few ways.
112
+ source: <pull.1327.git.1660892256.gitgitgadget@gmail.com>
113
+
114
+
115
+* mg/sequencer-untranslate-reflog (2022-08-19) 3 commits
116
+ - sequencer: do not translate command names
117
+ - sequencer: do not translate parameters to error_resolve_conflict()
118
+ - sequencer: do not translate reflog messages
119
+
120
+ The sequencer machinery translated messages left in the reflog by
121
+ mistake, which has been corrected.
122
+
123
+ Will merge to 'next'.
124
+ source: <cover.1660828108.git.git@grubix.eu>
125
+
126
+
127
+* tb/midx-with-changing-preferred-pack-fix (2022-08-19) 6 commits
128
+ - midx.c: include preferred pack correctly with existing MIDX
129
+ - midx.c: extract `midx_fanout_add_pack_fanout()`
130
+ - midx.c: extract `midx_fanout_add_midx_fanout()`
131
+ - midx.c: extract `struct midx_fanout`
132
+ - t/lib-bitmap.sh: avoid silencing stderr
133
+ - t5326: demonstrate potential bitmap corruption
134
+
135
+ Multi-pack index got corrupted when preferred pack changed from one
136
+ pack to another in a certain way, which has been corrected.
137
+
138
+ Needs review.
139
+ source: <cover.1660944574.git.me@ttaylorr.com>
140
+
141
+
142
+* vd/fix-perf-tests (2022-08-19) 2 commits
143
+ - p0006: fix 'read-tree' argument ordering
144
+ - p0004: fix prereq declaration
145
+
146
+ Rather trivial perf-test code fixes.
147
+
148
+ Will merge to 'next'.
149
+ source: <pull.1330.git.1660942149.gitgitgadget@gmail.com>
150
151
--------------------------------------------------
89
-[Cooking]
152
+[Graduated to 'master']
153
+
154
+* ds/bundle-uri-more (2022-08-10) 2 commits
155
+ (merged to 'next' on 2022-08-12 at 4f445a058d)
156
+ + bundle-uri: add example bundle organization
157
+ + docs: document bundle URI standard
158
+
159
+ The "bundle URI" design gets documented.
160
+ source: <pull.1248.v4.git.1660050761.gitgitgadget@gmail.com>
161
+
162
+
163
+* fc/vimdiff-layout-vimdiff3-fix (2022-08-10) 7 commits
164
+ (merged to 'next' on 2022-08-11 at a14fec292f)
165
+ + mergetools: vimdiff: simplify tabfirst
166
+ + mergetools: vimdiff: fix single window layouts
167
+ + mergetools: vimdiff: rework tab logic
168
+ + mergetools: vimdiff: fix for diffopt
169
+ + mergetools: vimdiff: silence annoying messages
170
+ + mergetools: vimdiff: make vimdiff3 actually work
171
+ + mergetools: vimdiff: fix comment
172
+
173
+ "vimdiff3" regression fix.
174
+ source: <20220810154618.307275-1-felipe.contreras@gmail.com>
175
+
176
+
177
+* jk/fsck-tree-mode-bits-fix (2022-08-10) 3 commits
178
+ (merged to 'next' on 2022-08-11 at 219fe53025)
179
+ + fsck: downgrade tree badFilemode to "info"
180
+ + fsck: actually detect bad file modes in trees
181
+ + tree-walk: add a mechanism for getting non-canonicalized modes
182
+
183
+ "git fsck" reads mode from tree objects but canonicalizes the mode
184
+ before passing it to the logic to check object sanity, which has
185
+ hid broken tree objects from the checking logic. This has been
186
+ corrected, but to help exiting projects with broken tree objects
187
+ that they cannot fix retroactively, the severity of anomalies this
188
+ code detects has been demoted to "info" for now.
189
+ source: <YvQcNpizy9uOZiAz@coredump.intra.peff.net>
190
+
191
192
* ll/disk-usage-humanise (2022-08-11) 1 commit
193
(merged to 'next' on 2022-08-14 at 3873a83f90)
@@ -95,12 +196,93 @@ Release tarballs are available at:
196
"git rev-list --disk-usage" learned to take an optional value
197
"human" to show the reported value in human-readable format, like
198
"3.40MiB".
199
+ source: <pull.1313.v5.git.1660193274336.gitgitgadget@gmail.com>
200
+
201
+
202
+* po/doc-add-renormalize (2022-08-10) 1 commit
203
+ (merged to 'next' on 2022-08-11 at 53851663eb)
204
+ + doc add: renormalize is not idempotent for CRCRLF
205
+
206
+ Documentation for "git add --renormalize" has been improved.
207
+ source: <20220810144450.470-2-philipoakley@iee.email>
208
+
209
+
210
+* sy/sparse-rm (2022-08-08) 5 commits
211
+ (merged to 'next' on 2022-08-12 at 5bf10965fb)
212
+ + rm: integrate with sparse-index
213
+ + rm: expand the index only when necessary
214
+ + pathspec.h: move pathspec_needs_expanded_index() from reset.c to here
215
+ + t1092: add tests for `git-rm`
216
+ + Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm
217
+ (this branch uses vd/sparse-reset-checkout-fixes.)
218
+
219
+ "git rm" has become more aware of the sparse-index feature.
220
+ source: <20220807041335.1790658-1-shaoxuan.yuan02@gmail.com>
221
+
222
+
223
+* vd/sparse-reset-checkout-fixes (2022-08-08) 4 commits
224
+ (merged to 'next' on 2022-08-12 at 755d6ecdb8)
225
+ + unpack-trees: unpack new trees as sparse directories
226
+ + cache.h: create 'index_name_pos_sparse()'
227
+ + oneway_diff: handle removed sparse directories
228
+ + checkout: fix nested sparse directory diff in sparse index
229
+ (this branch is used by sy/sparse-rm.)
230
+
231
+ Fixes to sparse index compatibility work for "reset" and "checkout"
232
+ commands.
233
+ source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
234
+
235
+--------------------------------------------------
236
+[Cooking]
237
+
238
+* vd/scalar-enables-fsmonitor (2022-08-18) 8 commits
239
+ (merged to 'next' on 2022-08-19 at 1e172e5647)
240
+ + scalar: update technical doc roadmap with FSMonitor support
241
+ + scalar unregister: stop FSMonitor daemon
242
+ + scalar: enable built-in FSMonitor on `register`
243
+ + scalar: move config setting logic into its own function
244
+ + scalar-delete: do not 'die()' in 'delete_enlistment()'
245
+ + scalar-[un]register: clearly indicate source of error
246
+ + scalar-unregister: handle error codes greater than 0
247
+ + scalar: constrain enlistment search
248
+
249
+ "scalar" now enables built-in fsmonitor on enlisted repositories,
250
+ when able.
251
252
Will merge to 'master'.
100
- source: <pull.1313.v5.git.1660193274336.gitgitgadget@gmail.com>
253
+ source: <pull.1324.v3.git.1660858853.gitgitgadget@gmail.com>
254
+
255
256
+* en/ancestry-path-in-a-range (2022-08-19) 3 commits
257
+ (merged to 'next' on 2022-08-19 at 4fce3015b3)
258
+ + revision: allow --ancestry-path to take an argument
259
+ + t6019: modernize tests with helper
260
+ + rev-list-options.txt: fix simple typo
261
103
-* ed/fsmonitor-on-network-disk (2022-08-11) 1 commit
262
+ "git rev-list --ancestry-path=C A..B" is a natural extension of
263
+ "git rev-list A..B"; instead of choosing a subset of A..B to those
264
+ that have ancestry relationship with A, it lets a subset with
265
+ ancestry relationship with C.
266
+
267
+ Will merge to 'master'.
268
+ source: <pull.1303.v3.git.1660883290.gitgitgadget@gmail.com>
269
+
270
+
271
+* en/submodule-merge-messages-fixes (2022-08-18) 3 commits
272
+ (merged to 'next' on 2022-08-18 at eb89a1e70f)
273
+ + merge-ort: provide helpful submodule update message when possible
274
+ + merge-ort: avoid surprise with new sub_flag variable
275
+ + merge-ort: remove translator lego in new "submodule conflict suggestion"
276
+ (this branch uses cw/submodule-merge-messages.)
277
+
278
+ Further update the help messages given while merging submodules.
279
+
280
+ Will merge to 'master'.
281
+ source: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com>
282
+
283
+
284
+* ed/fsmonitor-on-network-disk (2022-08-18) 2 commits
285
+ - fsmonitor: option to allow fsmonitor to run against network-mounted repos
286
(merged to 'next' on 2022-08-14 at 637d458d9c)
287
+ fsmonitor: option to allow fsmonitor to run against network-mounted repos
288
@@ -108,8 +290,10 @@ Release tarballs are available at:
290
repositories; a configuration knob for users to override this has
291
been introduced.
292
111
- Will merge to 'master'.
112
- source: <pull.1317.v4.git.1660262231357.gitgitgadget@gmail.com>
293
+ The second one needs more work.
294
+ cf. <4q6248n0-nqr5-p5pp-64s3-qq7nr53q01op@tzk.qr>
295
+ cf. <20220819185847.ulr5yjcfsahydeff@tb-raspi4>
296
+ source: <pull.1317.v3.git.1660242752495.gitgitgadget@gmail.com>
297
298
299
* jk/is-promisor-object-keep-tree-in-use (2022-08-14) 1 commit
@@ -134,7 +318,7 @@ Release tarballs are available at:
318
source: <4390677ec75d51487142adf7c2ab821cbd24a53e.1659477669.git.steadmon@google.com>
319
320
137
-* pw/rebase-keep-base-fixes (2022-08-15) 5 commits
321
+* pw/rebase-keep-base-fixes (2022-08-18) 5 commits
322
- rebase --keep-base: imply --no-fork-point
323
- rebase --keep-base: imply --reapply-cherry-picks
324
- rebase: factor out merge_base calculation
@@ -152,39 +336,6 @@ Release tarballs are available at:
336
source: <pull.1323.git.1660576283.gitgitgadget@gmail.com>
337
338
155
-* fc/vimdiff-layout-vimdiff3-fix (2022-08-10) 7 commits
156
- (merged to 'next' on 2022-08-11 at a14fec292f)
157
- + mergetools: vimdiff: simplify tabfirst
158
- + mergetools: vimdiff: fix single window layouts
159
- + mergetools: vimdiff: rework tab logic
160
- + mergetools: vimdiff: fix for diffopt
161
- + mergetools: vimdiff: silence annoying messages
162
- + mergetools: vimdiff: make vimdiff3 actually work
163
- + mergetools: vimdiff: fix comment
164
-
165
- "vimdiff3" regression fix.
166
-
167
- Will merge to 'master'.
168
- source: <20220810154618.307275-1-felipe.contreras@gmail.com>
169
-
170
-
171
-* jk/fsck-tree-mode-bits-fix (2022-08-10) 3 commits
172
- (merged to 'next' on 2022-08-11 at 219fe53025)
173
- + fsck: downgrade tree badFilemode to "info"
174
- + fsck: actually detect bad file modes in trees
175
- + tree-walk: add a mechanism for getting non-canonicalized modes
176
-
177
- "git fsck" reads mode from tree objects but canonicalizes the mode
178
- before passing it to the logic to check object sanity, which has
179
- hid broken tree objects from the checking logic. This has been
180
- corrected, but to help exiting projects with broken tree objects
181
- that they cannot fix retroactively, the severity of anomalies this
182
- code detects has been demoted to "info" for now.
183
-
184
- Will merge to 'master'.
185
- source: <YvQcNpizy9uOZiAz@coredump.intra.peff.net>
186
-
187
-
339
* ag/merge-strategies-in-c (2022-08-10) 14 commits
340
- sequencer: use the "octopus" strategy without forking
341
- sequencer: use the "resolve" strategy without forking
@@ -225,39 +376,25 @@ Release tarballs are available at:
376
source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
377
378
228
-* sy/sparse-rm (2022-08-08) 5 commits
229
- (merged to 'next' on 2022-08-12 at 5bf10965fb)
230
- + rm: integrate with sparse-index
231
- + rm: expand the index only when necessary
232
- + pathspec.h: move pathspec_needs_expanded_index() from reset.c to here
233
- + t1092: add tests for `git-rm`
234
- + Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm
235
- (this branch uses vd/sparse-reset-checkout-fixes.)
236
-
237
- "git rm" has become more aware of the sparse-index feature.
238
-
239
- Will merge to 'master'.
240
- source: <20220807041335.1790658-1-shaoxuan.yuan02@gmail.com>
241
-
242
-
379
* vd/scalar-generalize-diagnose (2022-08-12) 11 commits
244
- - scalar: update technical doc roadmap
245
- - scalar-diagnose: use 'git diagnose --mode=all'
246
- - builtin/bugreport.c: create '--diagnose' option
247
- - builtin/diagnose.c: add '--mode' option
248
- - builtin/diagnose.c: create 'git diagnose' builtin
249
- - diagnose.c: add option to configure archive contents
250
- - scalar-diagnose: move functionality to common location
251
- - scalar-diagnose: move 'get_disk_info()' to 'compat/'
252
- - scalar-diagnose: add directory to archiver more gently
253
- - scalar-diagnose: avoid 32-bit overflow of size_t
254
- - scalar-diagnose: use "$GIT_UNZIP" in test
380
+ (merged to 'next' on 2022-08-18 at bd8e574713)
381
+ + scalar: update technical doc roadmap
382
+ + scalar-diagnose: use 'git diagnose --mode=all'
383
+ + builtin/bugreport.c: create '--diagnose' option
384
+ + builtin/diagnose.c: add '--mode' option
385
+ + builtin/diagnose.c: create 'git diagnose' builtin
386
+ + diagnose.c: add option to configure archive contents
387
+ + scalar-diagnose: move functionality to common location
388
+ + scalar-diagnose: move 'get_disk_info()' to 'compat/'
389
+ + scalar-diagnose: add directory to archiver more gently
390
+ + scalar-diagnose: avoid 32-bit overflow of size_t
391
+ + scalar-diagnose: use "$GIT_UNZIP" in test
392
393
The "diagnose" feature to create a zip archive for diagnostic
394
material has been lifted from "scalar" and made into a feature of
395
"git bugreport".
396
260
- Will merge to 'next'?
397
+ Will merge to 'master'.
398
source: <pull.1310.v4.git.1660335019.gitgitgadget@gmail.com>
399
400
@@ -291,22 +428,7 @@ Release tarballs are available at:
428
source: <20220803205721.3686361-1-emilyshaffer@google.com>
429
430
294
-* vd/sparse-reset-checkout-fixes (2022-08-08) 4 commits
295
- (merged to 'next' on 2022-08-12 at 755d6ecdb8)
296
- + unpack-trees: unpack new trees as sparse directories
297
- + cache.h: create 'index_name_pos_sparse()'
298
- + oneway_diff: handle removed sparse directories
299
- + checkout: fix nested sparse directory diff in sparse index
300
- (this branch is used by sy/sparse-rm.)
301
-
302
- Fixes to sparse index compatibility work for "reset" and "checkout"
303
- commands.
304
-
305
- Will merge to 'master'.
306
- source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
307
-
308
-
309
-* sg/parse-options-subcommand (2022-07-25) 20 commits
431
+* sg/parse-options-subcommand (2022-08-19) 20 commits
432
- builtin/worktree.c: let parse-options parse subcommands
433
- builtin/stash.c: let parse-options parse subcommands
434
- builtin/sparse-checkout.c: let parse-options parse subcommands
@@ -314,7 +436,7 @@ Release tarballs are available at:
436
- builtin/reflog.c: let parse-options parse subcommands
437
- builtin/notes.c: let parse-options parse subcommands
438
- builtin/multi-pack-index.c: let parse-options parse subcommands
317
- - builtin/hook.c: let parse-option parse subcommands
439
+ - builtin/hook.c: let parse-options parse subcommands
440
- builtin/gc.c: let parse-options parse 'git maintenance's subcommands
441
- builtin/commit-graph.c: let parse-options parse subcommands
442
- builtin/bundle.c: let parse-options parse subcommands
@@ -331,39 +453,42 @@ Release tarballs are available at:
453
Introduce the "subcommand" mode to parse-options API and update the
454
command line parser of Git commands with subcommands.
455
334
- Expecting a reroll.
335
- cf. <20220812152837.GC3790@szeder.dev>
336
- source: <20220725123857.2773963-1-szeder.dev@gmail.com>
456
+ Will merge to 'next'?
457
+ source: <20220819160411.1791200-1-szeder.dev@gmail.com>
458
459
460
* ds/bundle-uri-clone (2022-08-10) 5 commits
340
- - clone: --bundle-uri cannot be combined with --depth
341
- - bundle-uri: add support for http(s):// and file://
342
- - clone: add --bundle-uri option
343
- - bundle-uri: create basic file-copy logic
344
- - remote-curl: add 'get' capability
461
+ (merged to 'next' on 2022-08-18 at 5e8a3ec71e)
462
+ + clone: --bundle-uri cannot be combined with --depth
463
+ + bundle-uri: add support for http(s):// and file://
464
+ + clone: add --bundle-uri option
465
+ + bundle-uri: create basic file-copy logic
466
+ + remote-curl: add 'get' capability
467
468
Implement "git clone --bundle-uri".
469
+
470
+ Will merge to 'master'.
471
source: <pull.1300.v3.git.1660050703.gitgitgadget@gmail.com>
472
473
474
* ds/decorate-filter-tweak (2022-08-05) 11 commits
351
- - fetch: use ref_namespaces during prefetch
352
- - maintenance: stop writing log.excludeDecoration
353
- - log: create log.initialDecorationSet=all
354
- - log: add --clear-decorations option
355
- - log: add default decoration filter
356
- - log-tree: use ref_namespaces instead of if/else-if
357
- - refs: use ref_namespaces for replace refs base
358
- - refs: add array of ref namespaces
359
- - t4207: test coloring of grafted decorations
360
- - t4207: modernize test
361
- - refs: allow "HEAD" as decoration filter
475
+ (merged to 'next' on 2022-08-19 at 064b9daa85)
476
+ + fetch: use ref_namespaces during prefetch
477
+ + maintenance: stop writing log.excludeDecoration
478
+ + log: create log.initialDecorationSet=all
479
+ + log: add --clear-decorations option
480
+ + log: add default decoration filter
481
+ + log-tree: use ref_namespaces instead of if/else-if
482
+ + refs: use ref_namespaces for replace refs base
483
+ + refs: add array of ref namespaces
484
+ + t4207: test coloring of grafted decorations
485
+ + t4207: modernize test
486
+ + refs: allow "HEAD" as decoration filter
487
488
The namespaces used by "log --decorate" from "refs/" hierarchy by
489
default has been tightened.
490
366
- Will merge to 'next'?
491
+ Will merge to 'master'.
492
source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
493
494
@@ -452,14 +577,15 @@ Release tarballs are available at:
577
578
579
* mt/rot13-in-c (2022-08-14) 4 commits
455
- - tests: use the new C rot13-filter helper to avoid PERL prereq
456
- - t0021: implementation the rot13-filter.pl script in C
457
- - t0021: avoid grepping for a Perl-specific string at filter output
458
- - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
580
+ (merged to 'next' on 2022-08-19 at 22152a150c)
581
+ + tests: use the new C rot13-filter helper to avoid PERL prereq
582
+ + t0021: implementation the rot13-filter.pl script in C
583
+ + t0021: avoid grepping for a Perl-specific string at filter output
584
+ + Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
585
586
Test portability improvements.
587
462
- Will merge to 'next'?
588
+ Will merge to 'master'.
589
source: <cover.1660522524.git.matheus.bernardino@usp.br>
590
591
@@ -468,6 +594,8 @@ Release tarballs are available at:
594
- api-trace2.txt: print config key-value pair
595
596
Tweak trace2 output about configuration variables.
597
+
598
+ Will merge to 'next'?
599
source: <cover.1660272404.git.dyroneteng@gmail.com>
600
601
@@ -510,16 +638,6 @@ Release tarballs are available at:
638
source: <20220804195105.1303455-1-calvinwan@google.com>
639
640
513
-* po/doc-add-renormalize (2022-08-10) 1 commit
514
- (merged to 'next' on 2022-08-11 at 53851663eb)
515
- + doc add: renormalize is not idempotent for CRCRLF
516
-
517
- Documentation for "git add --renormalize" has been improved.
518
-
519
- Will merge to 'master'.
520
- source: <20220810144450.470-2-philipoakley@iee.email>
521
-
522
-
641
* po/glossary-around-traversal (2022-07-09) 3 commits
642
- glossary: add reachability bitmap description
643
- glossary: add commit graph description
@@ -558,17 +676,6 @@ Release tarballs are available at:
676
source: <cover.1654552560.git.me@ttaylorr.com>
677
678
561
-* ds/bundle-uri-more (2022-08-10) 2 commits
562
- (merged to 'next' on 2022-08-12 at 4f445a058d)
563
- + bundle-uri: add example bundle organization
564
- + docs: document bundle URI standard
565
-
566
- The "bundle URI" design gets documented.
567
-
568
- Will merge to 'master'.
569
- source: <pull.1248.v4.git.1660050761.gitgitgadget@gmail.com>
570
-
571
-
679
* js/bisect-in-c (2022-06-27) 16 commits
680
- bisect: no longer try to clean up left-over `.git/head-name` files
681
- bisect: remove Cogito-related code
@@ -596,53 +703,6 @@ Release tarballs are available at:
703
--------------------------------------------------
704
[Discarded]
705
599
-* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
600
- . cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
601
-
602
- Clarifies that the "--no-rerere-autoupdate" option does not disable
603
- the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
604
-
605
- Superseded by jc/rerere-autoupdate-doc
606
- source: <20220715092527.1567837-1-mail@beyermatthias.de>
607
-
608
-
609
-* fr/vimdiff-layout-colors-fix (2022-08-07) 3 commits
610
- . mergetools: vimdiff: update unit tests
611
- . mergetools: vimdiff: fix single tab mode, single window mode and colors
612
- . mergetools: vimdiff: fix comment
613
-
614
- "vimdiff3" regression fix.
615
-
616
- Superseded by fc/vimdiff-layout-vimdiff3-fix
617
- source: <20220808053459.184367-1-greenfoo@u92.eu>
618
-
619
-
620
-* tk/apply-case-insensitive (2022-06-21) 3 commits
621
- . apply: support case-only renames in case-insensitive filesystems
622
- . reset: new failing test for reset of case-insensitive duplicate in index
623
- . t4141: test "git apply" with core.ignorecase
624
-
625
- "git apply" barfed on a patch that makes a case-only rename on a
626
- case-insensitive filesystem.
627
-
628
- In stalled state for too long.
629
- source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
630
-
631
-
632
-* bc/stash-export (2022-04-08) 4 commits
633
- . builtin/stash: provide a way to import stashes from a ref
634
- . builtin/stash: provide a way to export stashes to a ref
635
- . builtin/stash: factor out revision parsing into a function
636
- . object-name: make get_oid quietly return an error
637
-
638
- A mechanism to export and import stash entries to and from a normal
639
- commit to transfer it across repositories has been introduced.
640
-
641
- In stalled state for too long.
642
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
643
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
644
-
645
-
706
* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
707
. fetch,fetch-pack: clarify connectivity check error
708