What's cooking (2022/07 #05)
Junio C Hamano committed
Jul 17, 2022 at 15:38 UTC
23214fe8ad0739cf1f3b38488425ad307581c8d6
1 file changed
+225
-266
whats-cooking.txt
+225
-266
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #04; Wed, 13)
3
-X-master-at: 4e2a4d1dd44367d7783f33b169698f2930ff13c0
4
-X-next-at: 683cc31c60e2f21e9eb1dfeb04c5b8ef1ab1459d
2
+Subject: What's cooking in git.git (Jul 2022, #05; Sun, 17)
3
+X-master-at: 9dd64cb4d310986dd7b8ca7fff92f9b61e0bd21a
4
+X-next-at: 4dd4a117ecf0e90cdeac8c0e51a870de51791f4a
5
6
-What's cooking in git.git (Jul 2022, #04; Wed, 13)
6
+What's cooking in git.git (Jul 2022, #05; Sun, 17)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -12,8 +12,6 @@ topic is stable enough to be used and are candidate to be in a
12
future release). Commits prefixed with '-' are only in 'seen',
13
and aren't considered "accepted" at all.
14
15
-Maintenance releases v2.37.1 and others have been tagged.
16
-
15
Copies of the source code to Git live in many repositories, and the
16
following is a list of the ones I push into or their mirrors. Some
17
repositories have only a subset of branches.
@@ -45,115 +43,228 @@ Release tarballs are available at:
43
--------------------------------------------------
44
[Graduated to 'master']
45
48
-* ab/test-quoting-fix (2022-06-30) 3 commits
49
- (merged to 'next' on 2022-07-06 at 0aa78fd9db)
50
- + config tests: fix harmless but broken "rm -r" cleanup
51
- + test-lib.sh: fix prepend_var() quoting issue
52
- + tests: add missing double quotes to included library paths
46
+* ab/submodule-cleanup (2022-06-28) 12 commits
47
+ (merged to 'next' on 2022-07-08 at 6f3886aa03)
48
+ + git-sh-setup.sh: remove "say" function, change last users
49
+ + git-submodule.sh: use "$quiet", not "$GIT_QUIET"
50
+ + submodule--helper: eliminate internal "--update" option
51
+ + submodule--helper: understand --checkout, --merge and --rebase synonyms
52
+ + submodule--helper: report "submodule" as our name in some "-h" output
53
+ + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
54
+ + submodule update: remove "-v" option
55
+ + submodule--helper: have --require-init imply --init
56
+ + git-submodule.sh: remove unused top-level "--branch" argument
57
+ + git-submodule.sh: make the "$cached" variable a boolean
58
+ + git-submodule.sh: remove unused $prefix variable
59
+ + git-submodule.sh: remove unused sanitize_submodule_env()
60
+ (this branch is used by gc/submodule-use-super-prefix.)
61
+
62
+ Further preparation to turn git-submodule.sh into a builtin.
63
+ source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@gmail.com>
64
+
65
+
66
+* en/merge-tree (2022-06-22) 17 commits
67
+ (merged to 'next' on 2022-07-08 at a29b4896ab)
68
+ + git-merge-tree.txt: add a section on potentional usage mistakes
69
+ + merge-tree: add a --allow-unrelated-histories flag
70
+ + merge-tree: allow `ls-files -u` style info to be NUL terminated
71
+ + merge-ort: optionally produce machine-readable output
72
+ + merge-ort: store more specific conflict information
73
+ + merge-ort: make `path_messages` a strmap to a string_list
74
+ + merge-ort: store messages in a list, not in a single strbuf
75
+ + merge-tree: provide easy access to `ls-files -u` style info
76
+ + merge-tree: provide a list of which files have conflicts
77
+ + merge-ort: remove command-line-centric submodule message from merge-ort
78
+ + merge-ort: provide a merge_get_conflicted_files() helper function
79
+ + merge-tree: support including merge messages in output
80
+ + merge-ort: split out a separate display_update_messages() function
81
+ + merge-tree: implement real merges
82
+ + merge-tree: add option parsing and initial shell for real merge function
83
+ + merge-tree: move logic for existing merge into new function
84
+ + merge-tree: rename merge_trees() to trivial_merge_trees()
85
+
86
+ "git merge-tree" learned a new mode where it takes two commits and
87
+ computes a tree that would result in the merge commit, if the
88
+ histories leading to these two commits were to be merged.
89
+ source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
90
+
91
+
92
+* gg/worktree-from-the-above (2022-06-21) 2 commits
93
+ (merged to 'next' on 2022-07-08 at fa0e71ba39)
94
+ + dir: minor refactoring / clean-up
95
+ + dir: traverse into repository
96
+
97
+ In a non-bare repository, the behavior of Git when the
98
+ core.worktree configuration variable points at a directory that has
99
+ a repository as its subdirectory, regressed in Git 2.27 days.
100
+ source: <20220616234433.225-1-gg.oss@outlook.com>
101
+ source: <20220616231956.154-1-gg.oss@outlook.com>
102
+
103
+
104
+* hx/unpack-streaming (2022-06-13) 6 commits
105
+ (merged to 'next' on 2022-07-08 at 4eb375ec2f)
106
+ + unpack-objects: use stream_loose_object() to unpack large objects
107
+ + core doc: modernize core.bigFileThreshold documentation
108
+ + object-file.c: add "stream_loose_object()" to handle large object
109
+ + object-file.c: factor out deflate part of write_loose_object()
110
+ + object-file.c: refactor write_loose_object() to several steps
111
+ + unpack-objects: low memory footprint for get_data() in dry_run mode
112
+
113
+ Allow large objects read from a packstream to be streamed into a
114
+ loose object file straight, without having to keep it in-core as a
115
+ whole.
116
+ source: <cover.1654914555.git.chiyutianyi@gmail.com>
117
+
118
+
119
+* sy/mv-out-of-cone (2022-07-01) 8 commits
120
+ (merged to 'next' on 2022-07-08 at 654970fdb7)
121
+ + mv: add check_dir_in_index() and solve general dir check issue
122
+ + mv: use flags mode for update_mode
123
+ + mv: check if <destination> exists in index to handle overwriting
124
+ + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
125
+ + mv: decouple if/else-if checks using goto
126
+ + mv: update sparsity after moving from out-of-cone to in-cone
127
+ + t1092: mv directory from out-of-cone to in-cone
128
+ + t7002: add tests for moving out-of-cone file/directory
129
+
130
+ "git mv A B" in a sparsely populated working tree can be asked to
131
+ move a path between directories that are "in cone" (i.e. expected
132
+ to be materialized in the working tree) and "out of cone"
133
+ (i.e. expected to be hidden). The handling of such cases has been
134
+ improved.
135
+ source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com>
136
54
- Fixes for tests when the source directory has unusual characters in
55
- its path, e.g. whitespaces, double-quotes, etc.
56
- source: <cover-v2-0.3-00000000000-20220630T101646Z-avarab@gmail.com>
137
+--------------------------------------------------
138
+[New Topics]
139
140
+* js/ci-github-workflow-markup (2022-07-14) 1 commit
141
+ (merged to 'next' on 2022-07-15 at 196166f671)
142
+ + tests: fix incorrect --write-junit-xml code
143
59
-* cl/grep-max-count (2022-06-22) 1 commit
60
- (merged to 'next' on 2022-07-08 at 646199ab4c)
61
- + grep: add --max-count command line option
144
+ A fix for a regression in test framework.
145
63
- "git grep -m<max-hits>" is a way to limit the hits shown per file.
64
- source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
146
+ Will merge to 'master'.
147
+ source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
148
149
67
-* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit
68
- (merged to 'next' on 2022-07-08 at 6f639750a1)
69
- + i18n: mark message helpers prefix for translation
150
+* js/shortlog-sort-stably (2022-07-14) 1 commit
151
+ (merged to 'next' on 2022-07-15 at 75e4efe678)
152
+ + shortlog: use a stable sort
153
71
- Give _() markings to fatal/warning/usage: labels that are shown in
72
- front of these messages.
73
- source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>
154
+ "git shortlog -n" relied on the underlying qsort() to be stable,
155
+ which shouldn't have. Fixed.
156
157
+ Will merge to 'master'.
158
+ source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
159
76
-* ds/git-rebase-doc-markup (2022-06-30) 1 commit
77
- (merged to 'next' on 2022-07-08 at 24a0b80b71)
78
- + git-rebase.txt: use back-ticks consistently
160
80
- References to commands-to-be-typed-literally in "git rebase"
81
- documentation mark-up have been corrected.
82
- source: <pull.1270.v3.git.1656508868146.gitgitgadget@gmail.com>
161
+* mt/doc-config (2022-07-14) 3 commits
162
+ - doc: notes: unify configuration variables definitions
163
+ - doc: apply: unify configuration variables definitions
164
+ - doc: grep: unify configuration variables definitions
165
166
+ Unify description of configuration variables used by individual
167
+ commands in the documentation of the commands and the documentation
168
+ of the "git config".
169
85
-* ds/t5510-brokequote (2022-06-21) 1 commit
86
- (merged to 'next' on 2022-07-06 at 2776bed385)
87
- + t5510: replace 'origin' with URL more carefully
170
+ Retracted?.
171
+ cf. <CAHd-oW4zHA1YLX-5B1vYTA1f8PocziUCi0WxvSEkFUuf2GqKxg@mail.gmail.com>
172
+ source: <cover.1657819649.git.matheus.bernardino@usp.br>
173
89
- Test fix.
90
- source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>
174
175
+* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
176
+ (merged to 'next' on 2022-07-15 at 4dd4a117ec)
177
+ + mingw: avoid mktemp() in mkstemp() implementation
178
93
-* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit
94
- (merged to 'next' on 2022-07-06 at 627c51773c)
95
- + t6429: fix use of non-existent function
179
+ mkstemp() emulation on Windows has been improved.
180
97
- A test fix.
98
- source: <pull.1276.git.1656652799863.gitgitgadget@gmail.com>
181
+ Will merge to 'master'.
182
+ source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
183
184
101
-* jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit
102
- (merged to 'next' on 2022-07-08 at d4e49ad22a)
103
- + remote: handle negative refspecs in git remote show
104
- (this branch is used by jk/t5505-restructure.)
185
+* jt/fetch-pack-trace2-filter-spec (2022-07-15) 1 commit
186
+ - fetch-pack: write effective filter to trace2
187
106
- "git remote show [-n] frotz" now pays attention to negative
107
- pathspec.
108
- source: <20220617002036.1577-2-jacob.keller@gmail.com>
188
+ "git fetch" client logs the partial clone filter used in the trace2
189
+ output.
190
191
+ Will merge to 'next'?
192
+ source: <20220715172943.2681492-1-jonathantanmy@google.com>
193
+
194
+
195
+* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
196
+ - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere
197
111
-* ll/ls-files-tests-update (2022-07-06) 1 commit
112
- (merged to 'next' on 2022-07-06 at 444d1eabd0)
113
- + ls-files: update test style
198
+ Clarifies that the "--no-rerere-autoupdate" option does not disable
199
+ the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).
200
+
201
+ Will merge to 'next'?
202
+ source: <20220715092527.1567837-1-mail@beyermatthias.de>
203
115
- Test update.
116
- source: <pull.1269.v6.git.1656863349926.gitgitgadget@gmail.com>
204
205
+* rs/mergesort (2022-07-17) 10 commits
206
+ - mergesort: remove llist_mergesort()
207
+ - packfile: use DEFINE_LIST_SORT
208
+ - fetch-pack: use DEFINE_LIST_SORT
209
+ - commit: use DEFINE_LIST_SORT
210
+ - blame: use DEFINE_LIST_SORT
211
+ - test-mergesort: use DEFINE_LIST_SORT
212
+ - test-mergesort: use DEFINE_LIST_SORT_DEBUG
213
+ - mergesort: add macros for typed sort of linked lists
214
+ - mergesort: tighten merge loop
215
+ - mergesort: unify ranks loops
216
+
217
+ source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>
218
+
219
+--------------------------------------------------
220
+[Stalled]
221
119
-* ro/mktree-allow-missing-fix (2022-06-21) 1 commit
120
- (merged to 'next' on 2022-07-08 at 599ed6fb84)
121
- + mktree: do not check type of remote objects
222
+* ll/curl-accept-language (2022-07-11) 1 commit
223
+ (merged to 'next' on 2022-07-13 at 076aba7421)
224
+ + remote-curl: send Accept-Language header to server
225
123
- "git mktree --missing" lazily fetched objects that are missing from
124
- the local object store, which was totally unnecessary for the purpose
125
- of creating the tree object(s) from its input.
126
- source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
226
+ Earlier, HTTP transport clients learned to tell the server side
227
+ what locale they are in by sending Accept-Language HTTP header, but
228
+ this was done only for some requests but not others.
229
230
+ Will merge to 'master'.
231
+ source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
232
129
-* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit
130
- (merged to 'next' on 2022-07-06 at d7494fbdef)
131
- + pack-objects.h: remove outdated pahole results
233
133
- Comment fix.
134
- source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com>
234
+* bc/stash-export (2022-04-08) 4 commits
235
+ - builtin/stash: provide a way to import stashes from a ref
236
+ - builtin/stash: provide a way to export stashes to a ref
237
+ - builtin/stash: factor out revision parsing into a function
238
+ - object-name: make get_oid quietly return an error
239
240
+ A mechanism to export and import stash entries to and from a normal
241
+ commit to transfer it across repositories has been introduced.
242
137
-* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit
138
- (merged to 'next' on 2022-07-08 at 1075452f32)
139
- + rev-parse: documentation adjustment - mention remote tracking with @{u}
243
+ Expecting a reroll.
244
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
245
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
246
141
- Doc update.
142
- source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
247
248
+* cw/remote-object-info (2022-05-06) 11 commits
249
+ - SQUASH??? coccicheck
250
+ - SQUASH??? ensure that coccicheck is happy
251
+ - SQUASH??? compilation fix
252
+ - cat-file: add --batch-command remote-object-info command
253
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
254
+ - transport: add object-info fallback to fetch
255
+ - transport: add client side capability to request object-info
256
+ - object-info: send attribute packet regardless of object ids
257
+ - object-store: add function to free object_info contents
258
+ - fetch-pack: move fetch default settings
259
+ - fetch-pack: refactor packet writing
260
145
-* zk/push-use-bitmaps (2022-06-17) 1 commit
146
- (merged to 'next' on 2022-07-08 at 8aa1f94fad)
147
- + send-pack.c: add config push.useBitmaps
261
+ A client component to talk with the object-info endpoint.
262
149
- "git push" sometimes perform poorly when reachability bitmaps are
150
- used, even in a repository where other operations are helped by
151
- bitmaps. The push.useBitmaps configuration variable is introduced
152
- to allow disabling use of reachability bitmaps only for "git push".
153
- source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>
263
+ Expecting a reroll.
264
+ source: <20220502170904.2770649-1-calvinwan@google.com>
265
266
--------------------------------------------------
156
-[New Topics]
267
+[Cooking]
268
269
* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
270
(merged to 'next' on 2022-07-13 at 9db5235d01)
@@ -176,29 +287,28 @@ Release tarballs are available at:
287
source: <20220712231935.2979727-1-calvinwan@google.com>
288
289
179
-* ds/doc-allowlist (2022-07-13) 3 commits
180
- - *: use allowlist and denylist
181
- - t/*: use allowlist
182
- - Documentation: use allowlist and denylist
290
+* ds/doc-wo-whitelist (2022-07-14) 3 commits
291
+ - *: avoid "whitelist"
292
+ - t/*: avoid "whitelist"
293
+ - Documentation: remove use of whitelist
294
184
- Mechanical replacement of s/whitelist/allowlist/.
295
+ Avoid "white/black-list" in documentation and code comments.
296
186
- Expecting a reroll.
187
- source: <pull.1274.git.1657718450.gitgitgadget@gmail.com>
297
+ Will merge to 'next'?
298
+ source: <pull.1274.v2.git.1657852722.gitgitgadget@gmail.com>
299
300
190
-* js/vimdiff-quotepath-fix (2022-07-13) 2 commits
191
- - SQUASH???
192
- - mergetool(vimdiff): allow paths to contain spaces again
301
+* js/vimdiff-quotepath-fix (2022-07-14) 1 commit
302
+ (merged to 'next' on 2022-07-15 at 4273bbd4b4)
303
+ + mergetool(vimdiff): allow paths to contain spaces again
304
305
Variable quoting fix in the vimdiff driver of "git mergetool"
306
196
- Expecting a reroll.
197
- cf. <xmqqa69cabhq.fsf@gitster.g>
198
- source: <pull.1287.git.1657726969774.gitgitgadget@gmail.com>
307
+ Will merge to 'master'.
308
+ source: <pull.1287.v2.git.1657809063728.gitgitgadget@gmail.com>
309
310
201
-* mt/checkout-count-fix (2022-07-13) 3 commits
311
+* mt/checkout-count-fix (2022-07-14) 3 commits
312
- checkout: fix two bugs on the final count of updated entries
313
- checkout: show bug about failed entries being included in final report
314
- checkout: document bug where delayed checkout counts entries twice
@@ -207,10 +317,10 @@ Release tarballs are available at:
317
corrected.
318
319
Will merge to 'next'?
210
- source: <cover.1657685948.git.matheus.bernardino@usp.br>
320
+ source: <cover.1657799213.git.matheus.bernardino@usp.br>
321
322
213
-* tb/commit-graph-genv2-upgrade-fix (2022-07-13) 3 commits
323
+* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
324
- commit-graph: fix corrupt upgrade from generation v1 to v2
325
- commit-graph: introduce `repo_find_commit_pos_in_graph()`
326
- t5318: demonstrate commit-graph generation v2 corruption
@@ -218,7 +328,7 @@ Release tarballs are available at:
328
There was a bug in the codepath to upgrade generation information
329
in commit-graph from v1 to v2 format, which has been corrected.
330
221
- Needs review.
331
+ Will merge to 'next'?
332
source: <cover.1657667404.git.me@ttaylorr.com>
333
334
@@ -230,55 +340,6 @@ Release tarballs are available at:
340
Needs review.
341
source: <pull.1286.git.1657700238.gitgitgadget@gmail.com>
342
233
---------------------------------------------------
234
-[Stalled]
235
-
236
-* ll/curl-accept-language (2022-07-11) 1 commit
237
- (merged to 'next' on 2022-07-13 at 076aba7421)
238
- + remote-curl: send Accept-Language header to server
239
-
240
- Earlier, HTTP transport clients learned to tell the server side
241
- what locale they are in by sending Accept-Language HTTP header, but
242
- this was done only for some requests but not others.
243
-
244
- Will merge to 'master'.
245
- source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
246
-
247
-
248
-* bc/stash-export (2022-04-08) 4 commits
249
- - builtin/stash: provide a way to import stashes from a ref
250
- - builtin/stash: provide a way to export stashes to a ref
251
- - builtin/stash: factor out revision parsing into a function
252
- - object-name: make get_oid quietly return an error
253
-
254
- A mechanism to export and import stash entries to and from a normal
255
- commit to transfer it across repositories has been introduced.
256
-
257
- Expecting a reroll.
258
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
259
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
260
-
261
-
262
-* cw/remote-object-info (2022-05-06) 11 commits
263
- - SQUASH??? coccicheck
264
- - SQUASH??? ensure that coccicheck is happy
265
- - SQUASH??? compilation fix
266
- - cat-file: add --batch-command remote-object-info command
267
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
268
- - transport: add object-info fallback to fetch
269
- - transport: add client side capability to request object-info
270
- - object-info: send attribute packet regardless of object ids
271
- - object-store: add function to free object_info contents
272
- - fetch-pack: move fetch default settings
273
- - fetch-pack: refactor packet writing
274
-
275
- A client component to talk with the object-info endpoint.
276
-
277
- Expecting a reroll.
278
- source: <20220502170904.2770649-1-calvinwan@google.com>
279
-
280
---------------------------------------------------
281
-[Cooking]
343
344
* po/doc-add-renormalize (2022-07-09) 1 commit
345
- doc add: renormalize is not idempotent for CRCRLF
@@ -424,7 +485,7 @@ Release tarballs are available at:
485
source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
486
487
427
-* sa/cat-file-mailmap (2022-07-13) 4 commits
488
+* sa/cat-file-mailmap (2022-07-17) 4 commits
489
- cat-file: add mailmap support
490
- ident: rename commit_rewrite_person() to apply_mailmap_to_header()
491
- ident: move commit_rewrite_person() to ident.c
@@ -433,8 +494,9 @@ Release tarballs are available at:
494
"git cat-file" learned an option to use the mailmap when showing
495
commit and tag objects.
496
436
- Will merge to 'next'?
437
- source: <20220712160634.213956-1-siddharthasthana31@gmail.com>
497
+ Expecting a reroll; I think this is almost there.
498
+ cf. <xmqqo7xnv17x.fsf@gitster.g>
499
+ source: <20220716074055.1786231-1-siddharthasthana31@gmail.com>
500
501
502
* fr/vimdiff-layout-fix (2022-07-08) 1 commit
@@ -466,8 +528,7 @@ Release tarballs are available at:
528
"git rebase -i" learns to update branches whose tip appear in the
529
rebased range.
530
469
- Expecting a reroll.
470
- cf. <15631ea2-6722-fd24-c8a6-0cee638b0602@github.com>
531
+ Will merge to 'next'?
532
source: <pull.1247.v4.git.1657631225.gitgitgadget@gmail.com>
533
534
@@ -519,7 +580,6 @@ Release tarballs are available at:
580
+ submodule--helper update: use display path helper
581
+ submodule--helper tests: add missing "display path" coverage
582
+ Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
522
- (this branch uses ab/submodule-cleanup.)
583
584
Another step to rewrite more parts of "git submodule" in C.
585
@@ -553,27 +613,6 @@ Release tarballs are available at:
613
source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
614
615
556
-* sy/mv-out-of-cone (2022-07-01) 8 commits
557
- (merged to 'next' on 2022-07-08 at 654970fdb7)
558
- + mv: add check_dir_in_index() and solve general dir check issue
559
- + mv: use flags mode for update_mode
560
- + mv: check if <destination> exists in index to handle overwriting
561
- + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
562
- + mv: decouple if/else-if checks using goto
563
- + mv: update sparsity after moving from out-of-cone to in-cone
564
- + t1092: mv directory from out-of-cone to in-cone
565
- + t7002: add tests for moving out-of-cone file/directory
566
-
567
- "git mv A B" in a sparsely populated working tree can be asked to
568
- move a path between directories that are "in cone" (i.e. expected
569
- to be materialized in the working tree) and "out of cone"
570
- (i.e. expected to be hidden). The handling of such cases has been
571
- improved.
572
-
573
- Will merge to 'master'.
574
- source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com>
575
-
576
-
616
* ab/squelch-empty-fsync-traces (2022-06-30) 1 commit
617
. trace2: don't include "fsync" events in all trace2 logs
618
@@ -583,35 +622,6 @@ Release tarballs are available at:
622
source: <patch-v2-1.1-a1fc37de947-20220630T084607Z-avarab@gmail.com>
623
624
586
-* en/merge-tree (2022-06-22) 17 commits
587
- (merged to 'next' on 2022-07-08 at a29b4896ab)
588
- + git-merge-tree.txt: add a section on potentional usage mistakes
589
- + merge-tree: add a --allow-unrelated-histories flag
590
- + merge-tree: allow `ls-files -u` style info to be NUL terminated
591
- + merge-ort: optionally produce machine-readable output
592
- + merge-ort: store more specific conflict information
593
- + merge-ort: make `path_messages` a strmap to a string_list
594
- + merge-ort: store messages in a list, not in a single strbuf
595
- + merge-tree: provide easy access to `ls-files -u` style info
596
- + merge-tree: provide a list of which files have conflicts
597
- + merge-ort: remove command-line-centric submodule message from merge-ort
598
- + merge-ort: provide a merge_get_conflicted_files() helper function
599
- + merge-tree: support including merge messages in output
600
- + merge-ort: split out a separate display_update_messages() function
601
- + merge-tree: implement real merges
602
- + merge-tree: add option parsing and initial shell for real merge function
603
- + merge-tree: move logic for existing merge into new function
604
- + merge-tree: rename merge_trees() to trivial_merge_trees()
605
-
606
- A new command is introduced that takes two commits and computes a
607
- tree that would be contained in the resulting merge commit, if the
608
- histories leading to these two commits were to be merged, and is
609
- added as a new mode of "git merge-tree" subcommand.
610
-
611
- Will merge to 'master'.
612
- source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
613
-
614
-
625
* en/merge-restore-to-pristine (2022-06-21) 6 commits
626
- merge: do not exit restore_state() prematurely
627
- merge: ensure we can actually restore pre-merge state
@@ -664,11 +674,13 @@ Release tarballs are available at:
674
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
675
676
667
-* js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit
668
- - commit-graph: refactor to avoid prepare_repo_settings
677
+* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
678
+ - commit-graph: pass repo_settings instead of repository
679
670
- Expecting a reroll.
671
- source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com>
680
+ API tweak to make it easier to run fuzz testing on commit-graph parser.
681
+
682
+ Will merge to 'next'.
683
+ source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>
684
685
686
* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
@@ -684,28 +696,6 @@ Release tarballs are available at:
696
source: <20220610195247.1177549-1-jonathantanmy@google.com>
697
698
687
-* ab/submodule-cleanup (2022-06-28) 12 commits
688
- (merged to 'next' on 2022-07-08 at 6f3886aa03)
689
- + git-sh-setup.sh: remove "say" function, change last users
690
- + git-submodule.sh: use "$quiet", not "$GIT_QUIET"
691
- + submodule--helper: eliminate internal "--update" option
692
- + submodule--helper: understand --checkout, --merge and --rebase synonyms
693
- + submodule--helper: report "submodule" as our name in some "-h" output
694
- + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
695
- + submodule update: remove "-v" option
696
- + submodule--helper: have --require-init imply --init
697
- + git-submodule.sh: remove unused top-level "--branch" argument
698
- + git-submodule.sh: make the "$cached" variable a boolean
699
- + git-submodule.sh: remove unused $prefix variable
700
- + git-submodule.sh: remove unused sanitize_submodule_env()
701
- (this branch is used by gc/submodule-use-super-prefix.)
702
-
703
- Further preparation to turn git-submodule.sh into a builtin.
704
-
705
- Will merge to 'master'.
706
- source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@gmail.com>
707
-
708
-
699
* jc/resolve-undo (2022-07-11) 2 commits
700
(merged to 'next' on 2022-07-13 at b9ef9482e8)
701
+ fsck: do not dereference NULL while checking resolve-undo data
@@ -753,23 +743,6 @@ Release tarballs are available at:
743
source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
744
745
756
-* hx/unpack-streaming (2022-06-13) 6 commits
757
- (merged to 'next' on 2022-07-08 at 4eb375ec2f)
758
- + unpack-objects: use stream_loose_object() to unpack large objects
759
- + core doc: modernize core.bigFileThreshold documentation
760
- + object-file.c: add "stream_loose_object()" to handle large object
761
- + object-file.c: factor out deflate part of write_loose_object()
762
- + object-file.c: refactor write_loose_object() to several steps
763
- + unpack-objects: low memory footprint for get_data() in dry_run mode
764
-
765
- Allow large objects read from a packstream to be streamed into a
766
- loose object file straight, without having to keep it in-core as a
767
- whole.
768
-
769
- Will merge to 'master'.
770
- source: <cover.1654914555.git.chiyutianyi@gmail.com>
771
-
772
-
746
* tb/show-ref-count (2022-06-06) 2 commits
747
- builtin/show-ref.c: limit output with `--count`
748
- builtin/show-ref.c: rename `found_match` to `matches_nr`
@@ -821,33 +794,19 @@ Release tarballs are available at:
794
source: <pull.1132.v4.git.1656354677.gitgitgadget@gmail.com>
795
796
824
-* gc/bare-repo-discovery (2022-07-07) 5 commits
825
- - setup.c: create `discovery.bare`
826
- - safe.directory: use git_protected_config()
827
- - config: learn `git_protected_config()`
828
- - Documentation: define protected configuration
829
- - Documentation/git-config.txt: add SCOPES section
797
+* gc/bare-repo-discovery (2022-07-14) 5 commits
798
+ (merged to 'next' on 2022-07-15 at 5206577852)
799
+ + setup.c: create `safe.bareRepository`
800
+ + safe.directory: use git_protected_config()
801
+ + config: learn `git_protected_config()`
802
+ + Documentation: define protected configuration
803
+ + Documentation/git-config.txt: add SCOPES section
804
805
Introduce a discovery.barerepository configuration variable that
806
allows users to forbid discovery of bare repositories.
807
834
- Expecting a reroll.
835
- cf. <kl6lpmia55ys.fsf@chooglen-macbookpro.roam.corp.google.com>
836
- source: <pull.1261.v7.git.git.1657234914.gitgitgadget@gmail.com>
837
-
838
-
839
-* gg/worktree-from-the-above (2022-06-21) 2 commits
840
- (merged to 'next' on 2022-07-08 at fa0e71ba39)
841
- + dir: minor refactoring / clean-up
842
- + dir: traverse into repository
843
-
844
- In a non-bare repository, the behavior of Git when the
845
- core.worktree configuration variable points at a directory that has
846
- a repository as its subdirectory, regressed in Git 2.27 days.
847
-
808
Will merge to 'master'.
849
- source: <20220616234433.225-1-gg.oss@outlook.com>
850
- source: <20220616231956.154-1-gg.oss@outlook.com>
809
+ source: <pull.1261.v8.git.git.1657834081.gitgitgadget@gmail.com>
810
811
--------------------------------------------------
812
[Discarded]