What's cooking (2022/06 #03)
Junio C Hamano committed
Jun 10, 2022 at 16:35 UTC
d42bd3f245ef2d29f0610017033bfe20aac22c4c
1 file changed
+353
-590
whats-cooking.txt
+353
-590
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2022, #02; Tue, 7)
4
-X-master-at: 9c897eef06347cc5a3eb07c3ae409970ab1052c8
5
-X-next-at: c6f46106abc684656a9b2608ecedc4b8ac04b8ef
3
+Subject: What's cooking in git.git (Jun 2022, #03; Fri, 10)
4
+X-master-at: 5699ec1b0aec51b9e9ba5a2785f65970c5a95d84
5
+X-next-at: 398c3b25f6b9f91c426747cd7d43f16731766a3a
6
7
-What's cooking in git.git (Jun 2022, #02; Tue, 7)
7
+What's cooking in git.git (Jun 2022, #03; Fri, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,7 +14,8 @@ future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
This cycle will complete at around the end of June
17
-(https://tinyurl.com/gitCal); we are in the week #7 of the cycle.
17
+(https://tinyurl.com/gitCal); -rc0 and -rc1 are scheduled to happen
18
+next week.
19
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
@@ -47,295 +48,243 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
50
-* ab/plug-leak-in-revisions (2022-04-13) 28 commits
51
- (merged to 'next' on 2022-05-30 at 2ff85c8e71)
52
- + revisions API: add a TODO for diff_free(&revs->diffopt)
53
- + revisions API: have release_revisions() release "topo_walk_info"
54
- + revisions API: have release_revisions() release "date_mode"
55
- + revisions API: call diff_free(&revs->pruning) in revisions_release()
56
- + revisions API: release "reflog_info" in release revisions()
57
- + revisions API: clear "boundary_commits" in release_revisions()
58
- + revisions API: have release_revisions() release "prune_data"
59
- + revisions API: have release_revisions() release "grep_filter"
60
- + revisions API: have release_revisions() release "filter"
61
- + revisions API: have release_revisions() release "cmdline"
62
- + revisions API: have release_revisions() release "mailmap"
63
- + revisions API: have release_revisions() release "commits"
64
- + revisions API users: use release_revisions() for "prune_data" users
65
- + revisions API users: use release_revisions() with UNLEAK()
66
- + revisions API users: use release_revisions() in builtin/log.c
67
- + revisions API users: use release_revisions() in http-push.c
68
- + revisions API users: add "goto cleanup" for release_revisions()
69
- + stash: always have the owner of "stash_info" free it
70
- + revisions API users: use release_revisions() needing REV_INFO_INIT
71
- + revision.[ch]: document and move code declared around "init"
72
- + revisions API users: add straightforward release_revisions()
73
- + revision.[ch]: provide and start using a release_revisions()
74
- + cocci: add and apply free_commit_list() rules
75
- + format-patch: don't leak "extra_headers" or "ref_message_ids"
76
- + string_list API users: use string_list_init_{no,}dup
77
- + blame: use "goto cleanup" for cleanup_scoreboard()
78
- + t/helper/test-fast-rebase.c: don't leak "struct strbuf"
79
- + Merge branch 'ds/partial-bundle-more' into ab/plug-leak-in-revisions
80
-
81
- Plug the memory leaks from the trickiest API of all, the revision
82
- walker.
83
- source: <cover-v6-00.27-00000000000-20220413T195935Z-avarab@gmail.com>
84
-
85
-
86
-* ds/bundle-uri (2022-05-16) 8 commits
87
- (merged to 'next' on 2022-05-25 at 43b1b9092c)
88
- + bundle.h: make "fd" version of read_bundle_header() public
89
- + remote: allow relative_url() to return an absolute url
90
- + remote: move relative_url()
91
- + http: make http_get_file() external
92
- + fetch-pack: move --keep=* option filling to a function
93
- + fetch-pack: add a deref_without_lazy_fetch_extended()
94
- + dir API: add a generalized path_match_flags() function
95
- + connect.c: refactor sending of agent & object-format
96
- (this branch is used by ds/bundle-uri-more.)
97
-
98
- Preliminary code refactoring around transport and bundle code.
99
- source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
100
-
101
-
102
-* ds/object-file-unpack-loose-header-fix (2022-05-16) 1 commit
103
- (merged to 'next' on 2022-05-26 at b35a1d5db6)
104
- + object-file: convert 'switch' back to 'if'
105
-
106
- Coding style fix.
107
- source: <377be0e9-8a0f-4a86-0a66-3b08c0284dae@github.com>
108
-
109
-
110
-* ds/sparse-sparse-checkout (2022-05-23) 10 commits
111
- (merged to 'next' on 2022-05-26 at e0e07693c5)
112
- + sparse-checkout: integrate with sparse index
113
- + p2000: add test for 'git sparse-checkout [add|set]'
114
- + sparse-index: complete partial expansion
115
- + sparse-index: partially expand directories
116
- + sparse-checkout: --no-sparse-index needs a full index
117
- + cache-tree: implement cache_tree_find_path()
118
- + sparse-index: introduce partially-sparse indexes
119
- + sparse-index: create expand_index()
120
- + t1092: stress test 'git sparse-checkout set'
121
- + t1092: refactor 'sparse-index contents' test
122
-
123
- "sparse-checkout" learns to work well with the sparse-index
124
- feature.
125
- source: <pull.1208.v3.git.1653313726.gitgitgadget@gmail.com>
126
-
127
-
128
-* en/sparse-cone-becomes-default (2022-04-21) 9 commits
129
- (merged to 'next' on 2022-05-13 at c168eb55cf)
130
- + Documentation: some sparsity wording clarifications
131
- + git-sparse-checkout.txt: mark non-cone mode as deprecated
132
- + git-sparse-checkout.txt: flesh out pattern set sections a bit
133
- + git-sparse-checkout.txt: add a new EXAMPLES section
134
- + git-sparse-checkout.txt: shuffle some sections and mark as internal
135
- + git-sparse-checkout.txt: update docs for deprecation of 'init'
136
- + git-sparse-checkout.txt: wording updates for the cone mode default
137
- + sparse-checkout: make --cone the default
138
- + tests: stop assuming --no-cone is the default mode for sparse-checkout
139
-
140
- Deprecate non-cone mode of the sparse-checkout feature.
141
- source: <pull.1148.v3.git.1650594746.gitgitgadget@gmail.com>
142
-
143
-
144
-* fh/transport-push-leakfix (2022-05-27) 3 commits
145
- (merged to 'next' on 2022-05-30 at e70a36b915)
146
- + transport: free local and remote refs in transport_push()
147
- + transport: unify return values and exit point from transport_push()
148
- + transport: remove unnecessary indenting in transport_push()
149
-
150
- Leakfix.
151
- source: <20220520124952.2393299-1-frantisek@hrbata.com>
152
-
153
-
154
-* jc/all-negative-pathspec (2022-05-29) 1 commit
155
- (merged to 'next' on 2022-05-31 at 2d65a13996)
156
- + pathspec: correct an empty string used as a pathspec element
157
-
158
- A git subcommand like "git add -p" spawns a separate git process
159
- while relaying its command line arguments. A pathspec with only
160
- negative elements was mistakenly passed with an empty string, which
161
- has been corrected.
162
- source: <xmqqpmjwx8so.fsf_-_@gitster.g>
163
-
164
-
165
-* js/ci-github-workflow-markup (2022-05-21) 12 commits
166
- (merged to 'next' on 2022-05-30 at bd37e9e41f)
167
- + ci: call `finalize_test_case_output` a little later
168
- + ci(github): mention where the full logs can be found
169
- + ci: use `--github-workflow-markup` in the GitHub workflow
170
- + ci(github): avoid printing test case preamble twice
171
- + ci(github): skip the logs of the successful test cases
172
- + ci: optionally mark up output in the GitHub workflow
173
- + ci/run-build-and-tests: add some structure to the GitHub workflow output
174
- + ci: make it easier to find failed tests' logs in the GitHub workflow
175
- + ci/run-build-and-tests: take a more high-level view
176
- + test(junit): avoid line feeds in XML attributes
177
- + tests: refactor --write-junit-xml code
178
- + ci: fix code style
179
-
180
- Update the GitHub workflow support to make it quicker to get to the
181
- failing test.
182
- source: <pull.1117.v3.git.1653171536.gitgitgadget@gmail.com>
183
-
184
-
185
-* js/scalar-diagnose (2022-05-30) 8 commits
186
- (merged to 'next' on 2022-05-31 at 8c878f3ac5)
187
- + scalar: teach `diagnose` to gather loose objects information
188
- + scalar: teach `diagnose` to gather packfile info
189
- + scalar diagnose: include disk space information
190
- + scalar: implement `scalar diagnose`
191
- + scalar: validate the optional enlistment argument
192
- + archive --add-virtual-file: allow paths containing colons
193
- + archive: optionally add "virtual" files
194
- + Merge branch 'rs/document-archive-prefix' into js/scalar-diagnose
195
- (this branch uses rs/document-archive-prefix.)
196
-
197
- Implementation of "scalar diagnose" subcommand.
198
- source: <20220528231118.3504387-1-gitster@pobox.com>
199
-
200
-
201
-* jx/l10n-workflow-change (2022-05-26) 10 commits
202
- (merged to 'next' on 2022-05-26 at 252c979843)
203
- + l10n: Document the new l10n workflow
204
- + Makefile: add "po-init" rule to initialize po/XX.po
205
- + Makefile: add "po-update" rule to update po/XX.po
206
- + po/git.pot: don't check in result of "make pot"
207
- + po/git.pot: this is now a generated file
208
- + Makefile: remove duplicate and unwanted files in FOUND_SOURCE_FILES
209
- + i18n CI: stop allowing non-ASCII source messages in po/git.pot
210
- + Makefile: have "make pot" not "reset --hard"
211
- + Makefile: generate "po/git.pot" from stable LOCALIZED_C
212
- + Makefile: sort source files before feeding to xgettext
213
-
214
- A workflow change for translators are being proposed.
215
- source: <20220523152128.26380-1-worldhello.net@gmail.com>
216
-
217
-
218
-* kl/setup-in-unreadable-worktree (2022-05-24) 1 commit
219
- (merged to 'next' on 2022-05-27 at 4867873678)
220
- + setup: don't die if realpath(3) fails on getcwd(3)
221
-
222
- Disable the "do not remove the directory the user started Git in"
223
- logic when Git cannot tell where that directory is. Earlier we
224
- refused to run in such a case.
225
- source: <8b20840014d214023c50ee62439147f798e6f9cc.1653419993.git.kevin@kevinlocke.name>
226
-
227
-
228
-* ns/batch-fsync (2022-04-06) 13 commits
229
- (merged to 'next' on 2022-05-23 at 379d8bd500)
230
- + core.fsyncmethod: performance tests for batch mode
231
- + t/perf: add iteration setup mechanism to perf-lib
232
- + core.fsyncmethod: tests for batch mode
233
- + test-lib-functions: add parsing helpers for ls-files and ls-tree
234
- + core.fsync: use batch mode and sync loose objects by default on Windows
235
- + unpack-objects: use the bulk-checkin infrastructure
236
- + update-index: use the bulk-checkin infrastructure
237
- + builtin/add: add ODB transaction around add_files_to_cache
238
- + cache-tree: use ODB transaction around writing a tree
239
- + core.fsyncmethod: batched disk flushes for loose-objects
240
- + bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'
241
- + bulk-checkin: rename 'state' variable and separate 'plugged' boolean
242
- + Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
243
-
244
- Introduce a filesystem-dependent mechanism to optimize the way the
245
- bits for many loose object files are ensured to hit the disk
246
- platter.
247
- source: <pull.1134.v5.git.1648616734.gitgitgadget@gmail.com>
248
-
249
-
250
-* pb/use-freebsd-12.3-in-cirrus-ci (2022-05-25) 1 commit
251
- (merged to 'next' on 2022-05-26 at cea1e33100)
252
- + ci: update Cirrus-CI image to FreeBSD 12.3
253
-
254
- Update the version of FreeBSD image used in Cirrus CI.
255
- source: <20220525125112.86954-1-levraiphilippeblain@gmail.com>
256
-
257
-
258
-* rs/document-archive-prefix (2022-05-28) 1 commit
259
- (merged to 'next' on 2022-05-30 at c9e9c54880)
260
- + archive: improve documentation of --prefix
261
- (this branch is used by js/scalar-diagnose.)
262
-
263
- The documentation on the interaction between "--add-file" and
264
- "--prefix" options of "git archive" has been improved.
265
- source: <6ef7f836-45f6-8386-03c0-dc18b125ec67@web.de>
266
-
267
-
268
-* tb/cruft-packs (2022-05-26) 17 commits
269
- (merged to 'next' on 2022-05-27 at cfa4cbd790)
270
- + sha1-file.c: don't freshen cruft packs
271
- + builtin/gc.c: conditionally avoid pruning objects via loose
272
- + builtin/repack.c: add cruft packs to MIDX during geometric repack
273
- + builtin/repack.c: use named flags for existing_packs
274
- + builtin/repack.c: allow configuring cruft pack generation
275
- + builtin/repack.c: support generating a cruft pack
276
- + builtin/pack-objects.c: --cruft with expiration
277
- + reachable: report precise timestamps from objects in cruft packs
278
- + reachable: add options to add_unseen_recent_objects_to_traversal
279
- + builtin/pack-objects.c: --cruft without expiration
280
- + builtin/pack-objects.c: return from create_object_entry()
281
- + t/helper: add 'pack-mtimes' test-tool
282
- + pack-mtimes: support writing pack .mtimes files
283
- + chunk-format.h: extract oid_version()
284
- + pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
285
- + pack-mtimes: support reading .mtimes files
286
- + Documentation/technical: add cruft-packs.txt
287
-
288
- A mechanism to pack unreachable objects into a "cruft pack",
289
- instead of ejecting them into loose form to be reclaimed later, has
290
- been introduced.
291
- source: <cover.1653088640.git.me@ttaylorr.com>
292
-
293
-
294
-* tb/geom-repack-with-keep-and-max (2022-05-20) 3 commits
295
- (merged to 'next' on 2022-05-26 at 4068f4afd3)
296
- + builtin/repack.c: ensure that `names` is sorted
297
- + t7703: demonstrate object corruption with pack.packSizeLimit
298
- + repack: respect --keep-pack with geometric repack
299
-
300
- Teach "git repack --geometric" work better with "--keep-pack" and
301
- avoid corrupting the repository when packsize limit is used.
302
- source: <cover.1653073280.git.me@ttaylorr.com>
303
-
304
-
305
-* tb/midx-race-in-pack-objects (2022-05-24) 4 commits
306
- (merged to 'next' on 2022-05-26 at b51897dfc4)
307
- + builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
308
- + builtin/pack-objects.c: ensure included `--stdin-packs` exist
309
- + builtin/pack-objects.c: avoid redundant NULL check
310
- + pack-bitmap.c: check preferred pack validity when opening MIDX bitmap
311
-
312
- The multi-pack-index code did not protect the packfile it is going
313
- to depend on from getting removed while in use, which has been
314
- corrected.
315
- source: <cover.1653418457.git.me@ttaylorr.com>
51
+* ab/bug-if-bug (2022-06-02) 6 commits
52
+ (merged to 'next' on 2022-06-03 at 25290bb7ec)
53
+ + cache-tree.c: use bug() and BUG_if_bug()
54
+ + receive-pack: use bug() and BUG_if_bug()
55
+ + parse-options.c: use optbug() instead of BUG() "opts" check
56
+ + parse-options.c: use new bug() API for optbug()
57
+ + usage.c: add a non-fatal bug() function to go with BUG()
58
+ + common-main.c: move non-trace2 exit() behavior out of trace2.c
59
+
60
+ A new bug() and BUG_if_bug() API is introduced to make it easier to
61
+ uniformly log "detect multiple bugs and abort in the end" pattern.
62
+ source: <cover-v3-0.6-00000000000-20220602T122106Z-avarab@gmail.com>
63
+
64
+
65
+* ab/env-array (2022-06-02) 2 commits
66
+ (merged to 'next' on 2022-06-02 at e1e05318d3)
67
+ + run-command API users: use "env" not "env_array" in comments & names
68
+ + run-command API: rename "env_array" to "env"
69
70
+ Rename .env_array member to .env in the child_process structure.
71
+ source: <cover-v3-0.2-00000000000-20220602T090745Z-avarab@gmail.com>
72
318
-* yw/cmake-updates (2022-05-24) 3 commits
319
- (merged to 'next' on 2022-05-30 at ff3184441c)
320
- + cmake: remove (_)UNICODE def on Windows in CMakeLists.txt
321
- + cmake: add pcre2 support
322
- + cmake: fix CMakeLists.txt on Linux
73
324
- CMake updates.
325
- source: <pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com>
74
+* cb/buggy-gcc-12-workaround (2022-06-01) 1 commit
75
+ (merged to 'next' on 2022-06-01 at 01e199fd58)
76
+ + Revert -Wno-error=dangling-pointer
77
+
78
+ With a more targetted workaround in http.c in another topic, we may
79
+ be able to lift this blanket "GCC12 dangling-pointer warning is
80
+ broken and unsalvageable" workaround.
81
+
82
+
83
+* gc/zero-length-branch-config-fix (2022-06-01) 2 commits
84
+ (merged to 'next' on 2022-06-02 at 438605f627)
85
+ + remote.c: reject 0-length branch names
86
+ + remote.c: don't BUG() on 0-length branch names
87
+
88
+ A misconfigured 'branch..remote' led to a bug in configuration
89
+ parsing.
90
+ source: <pull.1273.git.git.1654038754.gitgitgadget@gmail.com>
91
+
92
+
93
+* jh/builtin-fsmonitor-part3 (2022-05-26) 31 commits
94
+ (merged to 'next' on 2022-06-02 at 3599e359b3)
95
+ + t7527: improve implicit shutdown testing in fsmonitor--daemon
96
+ + fsmonitor--daemon: allow --super-prefix argument
97
+ + t7527: test Unicode NFC/NFD handling on MacOS
98
+ + t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
99
+ + t/helper/hexdump: add helper to print hexdump of stdin
100
+ + fsmonitor: on macOS also emit NFC spelling for NFD pathname
101
+ + t7527: test FSMonitor on case insensitive+preserving file system
102
+ + fsmonitor: never set CE_FSMONITOR_VALID on submodules
103
+ + t/perf/p7527: add perf test for builtin FSMonitor
104
+ + t7527: FSMonitor tests for directory moves
105
+ + fsmonitor: optimize processing of directory events
106
+ + fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
107
+ + fsm-health-win32: force shutdown daemon if worktree root moves
108
+ + fsm-health-win32: add polling framework to monitor daemon health
109
+ + fsmonitor--daemon: stub in health thread
110
+ + fsmonitor--daemon: rename listener thread related variables
111
+ + fsmonitor--daemon: prepare for adding health thread
112
+ + fsmonitor--daemon: cd out of worktree root
113
+ + fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
114
+ + unpack-trees: initialize fsmonitor_has_run_once in o->result
115
+ + fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
116
+ + fsmonitor-settings: remote repos on Windows are incompatible
117
+ + fsmonitor-settings: remote repos on macOS are incompatible
118
+ + fsmonitor-settings: stub in macOS-specific incompatibility checking
119
+ + fsmonitor-settings: VFS for Git virtual repos are incompatible
120
+ + fsmonitor-settings: stub in Win32-specific incompatibility checking
121
+ + fsmonitor-settings: bare repos are incompatible with FSMonitor
122
+ + t/helper/fsmonitor-client: create stress test
123
+ + t7527: test FSMonitor on repos with Unicode root paths
124
+ + fsm-listen-win32: handle shortnames
125
+ + Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
126
+
127
+ More fsmonitor--daemon.
128
+ source: <pull.1143.v9.git.1653601644.gitgitgadget@gmail.com>
129
327
---------------------------------------------------
328
-[New Topics]
130
131
* jy/gitweb-xhtml5 (2022-06-02) 1 commit
132
(merged to 'next' on 2022-06-02 at cc6a77b48b)
133
+ gitweb: switch to an XHTML5 DOCTYPE
134
135
Update the doctype written in gitweb output to xhtml5.
136
+ source: <20220602114305.5915-1-jason@jasonyundt.email>
137
+
138
+--------------------------------------------------
139
+[New Topics]
140
+
141
+* gc/document-config-worktree-scope (2022-06-07) 1 commit
142
+ (merged to 'next' on 2022-06-08 at 85f62a864a)
143
+ + config: document and test the 'worktree' scope
144
+
145
+ Doc update.
146
147
Will merge to 'master'.
337
- source: <20220602114305.5915-1-jason@jasonyundt.email>
148
+ source: <pull.1274.git.git.1654637044966.gitgitgadget@gmail.com>
149
+
150
+
151
+* ds/branch-checked-out (2022-06-08) 4 commits
152
+ - branch: use branch_checked_out() when deleting refs
153
+ - fetch: use new branch_checked_out() and add tests
154
+ - branch: check for bisects and rebases
155
+ - branch: add branch_checked_out() helper
156
+
157
+ Introduce a helper to see if a branch is already being worked on
158
+ (hence should not be newly checked out in a working tree), which
159
+ performs much better than the existing find_shared_symref() to
160
+ replace many uses of the latter.
161
+
162
+ Will merge to 'next'?
163
+ source: <pull.1254.git.1654718942.gitgitgadget@gmail.com>
164
+
165
+
166
+* fs/ssh-default-key-command-doc (2022-06-08) 1 commit
167
+ (merged to 'next' on 2022-06-10 at b5cc5b6619)
168
+ + gpg docs: explain better use of ssh.defaultKeyCommand
169
+
170
+ Doc update.
171
+
172
+ Will merge to 'master'.
173
+ source: <20220608152437.126276-1-fs@gigacodes.de>
174
+
175
+
176
+* js/ci-github-workflow-markup (2022-06-10) 3 commits
177
+ - ci(github): also mark up compile errors
178
+ - ci(github): use grouping also in the `win-build` job
179
+ - ci(github): bring back the 'print test failures' step
180
+
181
+ Recent CI update hides certain failures in test jobs, which has
182
+ been corrected.
183
+
184
+ Will merge to 'next'?
185
+ source: <pull.1253.git.1654774347.gitgitgadget@gmail.com>
186
+
187
+
188
+* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
189
+ - fetch,fetch-pack: clarify connectivity check error
190
+
191
+ We may find an object missing after a "git fetch" stores the
192
+ objects it obtained from the other side, but it is not necessarily
193
+ because the remote failed to send necessary objects. Reword the
194
+ messages in an attempt to help users explore other possibilities
195
+ when they hit this error.
196
+
197
+ Expecting a reroll.
198
+ source: <20220610195247.1177549-1-jonathantanmy@google.com>
199
+
200
+
201
+* gc/submodule-update (2022-06-10) 8 commits
202
+ - submodule update: remove never-used expansion
203
+ - submodule update: stop parsing options in .sh
204
+ - submodule update: remove -v, pass --quiet
205
+ - submodule--helper update: use one param per type
206
+ - submodule update: pass --require-init and --init
207
+ - submodule update: pass options with stuck forms
208
+ - submodule update: pass options containing "[no-]"
209
+ - submodule update: remove intermediate parsing
210
+
211
+ More work on "git submodule update".
212
+
213
+ Needs review.
214
+ source: <pull.1275.git.git.1654820781.gitgitgadget@gmail.com>
215
+
216
+
217
+* jc/resolve-undo (2022-06-09) 1 commit
218
+ - revision: mark blobs needed for resolve-undo as reachable
219
+
220
+ The resolve-undo information in the index was not protected against
221
+ GC, which has been corrected.
222
+
223
+ Will merge to 'next'?
224
+ source: <xmqqfskdieqz.fsf@gitster.g>
225
+
226
+--------------------------------------------------
227
+[Stalled]
228
+
229
+* en/merge-tree (2022-02-23) 13 commits
230
+ - git-merge-tree.txt: add a section on potentional usage mistakes
231
+ - merge-tree: add a --allow-unrelated-histories flag
232
+ - merge-tree: allow `ls-files -u` style info to be NUL terminated
233
+ - merge-tree: provide easy access to `ls-files -u` style info
234
+ - merge-tree: provide a list of which files have conflicts
235
+ - merge-ort: provide a merge_get_conflicted_files() helper function
236
+ - merge-tree: support including merge messages in output
237
+ - merge-ort: split out a separate display_update_messages() function
238
+ - merge-tree: implement real merges
239
+ - merge-tree: add option parsing and initial shell for real merge function
240
+ - merge-tree: move logic for existing merge into new function
241
+ - merge-tree: rename merge_trees() to trivial_merge_trees()
242
+ - Merge branch 'en/remerge-diff' into en/merge-trees
243
+
244
+ A new command is introduced that takes two commits and computes a
245
+ tree that would be contained in the resulting merge commit, if the
246
+ histories leading to these two commits were to be merged, and is
247
+ added as a new mode of "git merge-tree" subcommand.
248
+
249
+ On hold.
250
+ cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
251
+ source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
252
+
253
+
254
+* bc/stash-export (2022-04-08) 4 commits
255
+ - builtin/stash: provide a way to import stashes from a ref
256
+ - builtin/stash: provide a way to export stashes to a ref
257
+ - builtin/stash: factor out revision parsing into a function
258
+ - object-name: make get_oid quietly return an error
259
+
260
+ A mechanism to export and import stash entries to and from a normal
261
+ commit to transfer it across repositories has been introduced.
262
+
263
+ Expecting a reroll.
264
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
265
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
266
+
267
+
268
+* cw/remote-object-info (2022-05-06) 11 commits
269
+ - SQUASH??? coccicheck
270
+ - SQUASH??? ensure that coccicheck is happy
271
+ - SQUASH??? compilation fix
272
+ - cat-file: add --batch-command remote-object-info command
273
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
274
+ - transport: add object-info fallback to fetch
275
+ - transport: add client side capability to request object-info
276
+ - object-info: send attribute packet regardless of object ids
277
+ - object-store: add function to free object_info contents
278
+ - fetch-pack: move fetch default settings
279
+ - fetch-pack: refactor packet writing
280
281
+ A client component to talk with the object-info endpoint.
282
+
283
+ Expecting a reroll.
284
+ source: <20220502170904.2770649-1-calvinwan@google.com>
285
+
286
+--------------------------------------------------
287
+[Cooking]
288
289
* pb/range-diff-with-submodule (2022-06-06) 1 commit
290
(merged to 'next' on 2022-06-07 at e5e31590c4)
@@ -349,41 +298,29 @@ Release tarballs are available at:
298
source: <pull.1244.v2.git.1654549153769.gitgitgadget@gmail.com>
299
300
352
-* jp/prompt-clear-before-upstream-mark (2022-06-07) 1 commit
353
- - git-prompt: make colourization consistent
301
+* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits
302
+ - git-prompt: fix expansion of branch colour codes
303
+ (merged to 'next' on 2022-06-08 at 201a84ad63)
304
+ + git-prompt: make colourization consistent
305
306
Bash command line prompt (in contrib/) update.
307
308
Will merge to 'next'.
358
- source: <20220607115024.64724-1-joak-pet@online.no>
309
+ source: <20220609204447.32841-1-joak-pet@online.no>
310
+ source: <20220606175022.8410-1-joak-pet@online.no>
311
312
313
* jt/unparse-commit-upon-graft-change (2022-06-06) 1 commit
362
- - commit,shallow: unparse commits if grafts changed
314
+ (merged to 'next' on 2022-06-08 at 3d8de84325)
315
+ + commit,shallow: unparse commits if grafts changed
316
317
Updating the graft information invalidates the list of parents of
318
in-core commit objects that used to be in the graft file.
319
367
- Will merge to 'next'.
320
+ Will merge to 'master'.
321
source: <20220606175437.1740447-1-jonathantanmy@google.com>
322
323
371
-* ds/rebase-update-refs (2022-06-07) 7 commits
372
- - rebase: add rebase.updateRefs config option
373
- - sequencer: implement 'update-refs' command
374
- - rebase: add --update-refs option
375
- - sequencer: add update-refs command
376
- - sequencer: define array with enum values
377
- - branch: add branch_checked_out() helper
378
- - log-tree: create for_each_decoration()
379
-
380
- "git rebase" learns "--update-refs" to update the refs that point
381
- at commits being rewritten so that they point at the corresponding
382
- commits in the rewritten history.
383
-
384
- source: <3d7d3f656b4e93e8caa0d18d29c318ede956d1d7.1654634569.git.gitgitgadget@gmail.com>
385
-
386
-
324
* ab/build-gitweb (2022-06-02) 7 commits
325
- Makefile: build 'gitweb' in the default target
326
- gitweb/Makefile: include in top-level Makefile
@@ -393,6 +330,9 @@ Release tarballs are available at:
330
- gitweb/Makefile: add a $(GITWEB_ALL) variable
331
- gitweb/Makefile: define all .PHONY prerequisites inline
332
333
+ Teach "make all" to build gitweb as well.
334
+
335
+ Needs review.
336
source: <cover-v2-0.7-00000000000-20220531T173805Z-avarab@gmail.com>
337
338
@@ -405,21 +345,26 @@ Release tarballs are available at:
345
- tests: don't depend on template-created .git/branches
346
- t0008: don't rely on default ".git/info/exclude"
347
348
+ Tweak tests so that they still work when the "git init" template
349
+ did not create .git/info directory.
350
+
351
+ Will merge to 'next'?
352
source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
353
354
411
-* ac/bitmap-format-doc (2022-06-07) 3 commits
355
+* ac/bitmap-format-doc (2022-06-10) 3 commits
356
- bitmap-format.txt: add information for trailing checksum
357
- bitmap-format.txt: fix some formatting issues
358
- bitmap-format.txt: feed the file to asciidoc to generate html
359
416
- Adjust technical/bitmap-format to be formatted by AsciiDoc.
360
+ Adjust technical/bitmap-format to be formatted by AsciiDoc, and
361
+ add some missing information to the documentation.
362
418
- Needs more work to really use AsciiDoc to produce true HTML.
419
- source: <pull.1246.v2.git.1654623814.gitgitgadget@gmail.com>
363
+ Will merge to 'next'?
364
+ source: <pull.1246.v3.git.1654858481.gitgitgadget@gmail.com>
365
366
422
-* hx/unpack-streaming (2022-06-06) 7 commits
367
+* hx/unpack-streaming (2022-06-10) 7 commits
368
- unpack-objects: use stream_loose_object() to unpack large objects
369
- core doc: modernize core.bigFileThreshold documentation
370
- object-file.c: add "stream_loose_object()" to handle large object
@@ -432,64 +377,68 @@ Release tarballs are available at:
377
loose object file straight, without having to keep it in-core as a
378
whole.
379
435
- Needs rebasing on batched-fsync stuff.
436
- cf. <7ba4858a-d1cc-a4eb-b6d6-4c04a5dd6ce7@gmail.com>
437
- source: <cover-v13-0.7-00000000000-20220604T095113Z-avarab@gmail.com>
380
+ Will merge to 'next'?
381
+ source: <cover.1654871915.git.chiyutianyi@gmail.com>
382
383
384
* po/rebase-preserve-merges (2022-06-06) 4 commits
441
- - rebase: translate a die(preserve-merges) message
442
- - rebase: note `preserve` merges may be a pull config option
443
- - rebase: help users when dying with `preserve-merges`
444
- - rebase.c: state preserve-merges has been removed
385
+ (merged to 'next' on 2022-06-10 at 471f67aebc)
386
+ + rebase: translate a die(preserve-merges) message
387
+ + rebase: note `preserve` merges may be a pull config option
388
+ + rebase: help users when dying with `preserve-merges`
389
+ + rebase.c: state preserve-merges has been removed
390
391
Various error messages that talk about the removal of
392
"--preserve-merges" in "rebase" have been strengthened, and "rebase
393
--abort" learned to get out of a state that was left by an earlier
394
use of the option.
395
451
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
source: <pull.1242.v2.git.1654341469.gitgitgadget@gmail.com>
398
399
400
* tb/show-ref-optim (2022-06-06) 1 commit
456
- - builtin/show-ref.c: avoid over-iterating with --heads, --tags
401
+ (merged to 'next' on 2022-06-08 at 683a3cc261)
402
+ + builtin/show-ref.c: avoid over-iterating with --heads, --tags
403
404
"git show-ref --heads" (and "--tags") still iterated over all the
405
refs, which has been corrected.
406
461
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
source: <3fa6932641f18d78156bbf60b1571383f2cb5046.1654293264.git.me@ttaylorr.com>
409
410
411
* zh/read-cache-copy-name-entry-fix (2022-06-06) 1 commit
466
- - read-cache.c: reduce unnecessary cache entry name copying
412
+ (merged to 'next' on 2022-06-08 at 760f43dd19)
413
+ + read-cache.c: reduce unnecessary cache entry name copying
414
415
Remove redundant copying (with index v3 and older) or possible
416
over-reading beyond end of mmapped memory (with index v4) has been
417
corrected.
418
472
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
source: <pull.1249.git.1654436248249.gitgitgadget@gmail.com>
421
422
423
* ab/remote-free-fix (2022-06-07) 2 commits
477
- - remote.c: don't dereference NULL in freeing loop
478
- - remote.c: remove braces from one-statement "for"-loops
424
+ (merged to 'next' on 2022-06-08 at 03c3aeaeee)
425
+ + remote.c: don't dereference NULL in freeing loop
426
+ + remote.c: remove braces from one-statement "for"-loops
427
428
Use-after-free (with another forget-to-free) fix.
429
482
- Will merge to 'next'.
430
+ Will merge to 'master'.
431
source: <cover-0.3-00000000000-20220607T154520Z-avarab@gmail.com>
432
433
434
* sn/fsmonitor-missing-clock (2022-06-07) 1 commit
487
- - fsmonitor: query watchman with right valid json
435
+ (merged to 'next' on 2022-06-08 at 812b99338c)
436
+ + fsmonitor: query watchman with right valid json
437
438
Sample watchman interface hook sometimes failed to produce
439
correctly formatted JSON message, which has been corrected.
440
492
- Will merge to 'next'.
441
+ Will merge to 'master'.
442
source: <20220607111419.15753-1-sluongng@gmail.com>
443
444
@@ -510,186 +459,30 @@ Release tarballs are available at:
459
460
Remove a coccinelle rule that is no longer relevant.
461
462
+ Will merge to 'next'.
463
source: <xmqq7d5suoqt.fsf@gitster.g>
464
515
---------------------------------------------------
516
-[Stalled]
517
-
518
-* en/merge-tree (2022-02-23) 13 commits
519
- - git-merge-tree.txt: add a section on potentional usage mistakes
520
- - merge-tree: add a --allow-unrelated-histories flag
521
- - merge-tree: allow `ls-files -u` style info to be NUL terminated
522
- - merge-tree: provide easy access to `ls-files -u` style info
523
- - merge-tree: provide a list of which files have conflicts
524
- - merge-ort: provide a merge_get_conflicted_files() helper function
525
- - merge-tree: support including merge messages in output
526
- - merge-ort: split out a separate display_update_messages() function
527
- - merge-tree: implement real merges
528
- - merge-tree: add option parsing and initial shell for real merge function
529
- - merge-tree: move logic for existing merge into new function
530
- - merge-tree: rename merge_trees() to trivial_merge_trees()
531
- - Merge branch 'en/remerge-diff' into en/merge-trees
532
-
533
- A new command is introduced that takes two commits and computes a
534
- tree that would be contained in the resulting merge commit, if the
535
- histories leading to these two commits were to be merged, and is
536
- added as a new mode of "git merge-tree" subcommand.
537
-
538
- On hold.
539
- cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
540
- source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
541
-
542
-
543
-* ab/ci-github-workflow-markup (2022-05-26) 14 commits
544
- . CI: make the --github-workflow-markup "github" output the default
545
- . CI: make --github-workflow-markup ci-config, off by default
546
- . ci: call `finalize_test_case_output` a little later
547
- . ci(github): mention where the full logs can be found
548
- . ci(github): avoid printing test case preamble twice
549
- . ci(github): skip "skip" tests in --github-workflow-markup
550
- . ci(github): skip the logs of the successful test cases
551
- . ci: make it easier to find failed tests' logs in the GitHub workflow
552
- . ci: optionally mark up output in the GitHub workflow
553
- . test(junit): avoid line feeds in XML attributes
554
- . tests: refactor --write-junit-xml code
555
- . CI: stop setting FAILED_TEST_ARTIFACTS N times
556
- . CI: don't include "test-results/" in ci/print-test-failures.sh output
557
- . CI: don't "cd" in ci/print-test-failures.sh
558
- (this branch uses ab/ci-setup-simplify.)
559
-
560
- Build a moral equivalent of js/ci-github-workflow-markup on top of
561
- ab/ci-setup-simplify.
562
-
563
-
564
-* ab/ci-setup-simplify (2022-05-26) 29 commits
565
- . CI: make it easy to use ci/*.sh outside of CI
566
- . CI: don't use "set -x" in "ci/lib.sh" output
567
- . CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
568
- . CI: set SANITIZE=leak in MAKEFLAGS directly
569
- . CI: set CC in MAKEFLAGS directly, don't add it to the environment
570
- . CI: add more variables to MAKEFLAGS, except under vs-build
571
- . CI: narrow down variable definitions in --build and --test
572
- . CI: only invoke ci/lib.sh as "steps" in main.yml
573
- . CI: pre-select test slice in Windows & VS tests
574
- . ci/run-test-slice.sh: replace shelling out with "echo"
575
- . CI: move "env" definitions into ci/lib.sh
576
- . CI: combine ci/install{,-docker}-dependencies.sh
577
- . CI: split up and reduce "ci/test-documentation.sh"
578
- . CI: invoke "make artifacts-tar" directly in windows-build
579
- . CI: check ignored unignored build artifacts in "win[+VS] build" too
580
- . CI: make ci/{lib,install-dependencies}.sh POSIX-compatible
581
- . CI: remove "run-build-and-tests.sh", run "make [test]" directly
582
- . CI: export variables via a wrapper
583
- . CI: consistently use "export" in ci/lib.sh
584
- . CI: move p4 and git-lfs variables to ci/install-dependencies.sh
585
- . CI: have "static-analysis" run "check-builtins", not "documentation"
586
- . CI: have "static-analysis" run a "make ci-static-analysis" target
587
- . CI: don't have "git grep" invoke a pager in tree content check
588
- . CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS
589
- . CI: remove unused Azure ci/* code
590
- . CI: remove dead "tree skipping" code
591
- . CI: remove more dead Travis CI support
592
- . CI: make "$jobname" explicit, remove fallback
593
- . CI: run "set -ex" early in ci/lib.sh
594
- (this branch is used by ab/ci-github-workflow-markup.)
595
-
596
- Drive more actions done in CI via the Makefile instead of shell
597
- commands sprinkled in .github/workflows/main.yml
598
- source: <cover-v6-00.29-00000000000-20220525T094123Z-avarab@gmail.com>
599
-
600
-
601
-* bc/stash-export (2022-04-08) 4 commits
602
- - builtin/stash: provide a way to import stashes from a ref
603
- - builtin/stash: provide a way to export stashes to a ref
604
- - builtin/stash: factor out revision parsing into a function
605
- - object-name: make get_oid quietly return an error
606
-
607
- A mechanism to export and import stash entries to and from a normal
608
- commit to transfer it across repositories has been introduced.
609
-
610
- Expecting a reroll.
611
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
612
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
613
-
614
-
615
-* cw/remote-object-info (2022-05-06) 11 commits
616
- - SQUASH??? coccicheck
617
- - SQUASH??? ensure that coccicheck is happy
618
- - SQUASH??? compilation fix
619
- - cat-file: add --batch-command remote-object-info command
620
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
621
- - transport: add object-info fallback to fetch
622
- - transport: add client side capability to request object-info
623
- - object-info: send attribute packet regardless of object ids
624
- - object-store: add function to free object_info contents
625
- - fetch-pack: move fetch default settings
626
- - fetch-pack: refactor packet writing
627
-
628
- A client component to talk with the object-info endpoint.
629
-
630
- Expecting a reroll.
631
- source: <20220502170904.2770649-1-calvinwan@google.com>
632
-
633
---------------------------------------------------
634
-[Cooking]
465
466
* js/wait-or-whine-can-fail (2022-06-07) 1 commit
637
- - run-command: don't spam trace2_child_exit()
467
+ (merged to 'next' on 2022-06-08 at 54fe70c95d)
468
+ + run-command: don't spam trace2_child_exit()
469
470
We used to log an error return from wait_or_whine() as process
471
termination of the waited child, which was incorrect.
472
642
- Will merge to 'next'.
473
+ Will merge to 'master'.
474
source: <50d872a057a558fa5519856b95abd048ddb514dc.1654625626.git.steadmon@google.com>
475
476
477
* ds/credentials-in-url (2022-06-06) 1 commit
647
- - remote: create fetch.credentialsInUrl config
478
+ (merged to 'next' on 2022-06-08 at 3db83a2012)
479
+ + remote: create fetch.credentialsInUrl config
480
481
The "fetch.credentialsInUrl" configuration variable controls what
482
happens when a URL with embedded login credential is used.
483
652
- Will merge to 'next'.
653
- source: <pull.1237.v5.git.1654526176695.gitgitgadget@gmail.com>
654
-
655
-
656
-* ab/bug-if-bug (2022-06-02) 6 commits
657
- (merged to 'next' on 2022-06-03 at 25290bb7ec)
658
- + cache-tree.c: use bug() and BUG_if_bug()
659
- + receive-pack: use bug() and BUG_if_bug()
660
- + parse-options.c: use optbug() instead of BUG() "opts" check
661
- + parse-options.c: use new bug() API for optbug()
662
- + usage.c: add a non-fatal bug() function to go with BUG()
663
- + common-main.c: move non-trace2 exit() behavior out of trace2.c
664
-
665
- A new bug() and BUG_if_bug() API is introduced to make it easier to
666
- uniformly log "detect multiple bugs and abort in the end" pattern.
667
-
484
Will merge to 'master'.
669
- source: <cover-v3-0.6-00000000000-20220602T122106Z-avarab@gmail.com>
670
-
671
-
672
-* cb/buggy-gcc-12-workaround (2022-06-01) 1 commit
673
- (merged to 'next' on 2022-06-01 at 01e199fd58)
674
- + Revert -Wno-error=dangling-pointer
675
-
676
- With a more targetted workaround in http.c in another topic, we may
677
- be able to lift this blanket "GCC12 dangling-pointer warning is
678
- broken and unsalvageable" workaround.
679
-
680
- Will merge to 'master'.
681
-
682
-
683
-* gc/zero-length-branch-config-fix (2022-06-01) 2 commits
684
- (merged to 'next' on 2022-06-02 at 438605f627)
685
- + remote.c: reject 0-length branch names
686
- + remote.c: don't BUG() on 0-length branch names
687
-
688
- A misconfigured 'branch..remote' led to a bug in configuration
689
- parsing.
690
-
691
- Will merge to 'master'.
692
- source: <pull.1273.git.git.1654038754.gitgitgadget@gmail.com>
485
+ source: <pull.1237.v5.git.1654526176695.gitgitgadget@gmail.com>
486
487
488
* tl/ls-tree-oid-only (2022-06-03) 1 commit
@@ -710,6 +503,9 @@ Release tarballs are available at:
503
- remote-curl: add 'get' capability
504
- docs: document bundle URI standard
505
506
+ The "bundle URI" topic.
507
+
508
+ Needs review.
509
source: <pull.1248.git.1654545325.gitgitgadget@gmail.com>
510
511
@@ -759,22 +555,22 @@ Release tarballs are available at:
555
by root a safe one, too (after all, if an attacker can craft a
556
malicious repository owned by root, the box is 0wned already).
557
762
- What's our take on this one? IIRC, the last time we discussed,
763
- Carlo was hesitant to push this step forward?
558
+ Will merge to 'next'?
559
cf. <20220519152344.ktrifm3pc42bjruh@Carlos-MacBook-Pro-2.local>
560
source: <20220513010020.55361-5-carenas@gmail.com>
561
562
563
* ab/hooks-regression-fix (2022-06-07) 2 commits
769
- - hook API: fix v2.36.0 regression: hooks should be connected to a TTY
770
- - run-command: add an "ungroup" option to run_process_parallel()
564
+ (merged to 'next' on 2022-06-08 at c1109feb67)
565
+ + hook API: fix v2.36.0 regression: hooks should be connected to a TTY
566
+ + run-command: add an "ungroup" option to run_process_parallel()
567
568
In Git 2.36 we revamped the way how hooks are invoked. One change
569
that is end-user visible is that the output of a hook is no longer
570
directly connected to the standard output of "git" that spawns the
571
hook, which was noticed post release. This is getting corrected.
572
777
- Will merge to 'next'.
573
+ Will merge to 'master'.
574
source: <cover-v6-0.2-00000000000-20220606T170356Z-avarab@gmail.com>
575
576
@@ -820,112 +616,79 @@ Release tarballs are available at:
616
Thoughts?
617
source: <20220422083629.1404989-1-hi@alyssa.is>
618
823
-
824
-* ab/env-array (2022-06-02) 2 commits
825
- (merged to 'next' on 2022-06-02 at e1e05318d3)
826
- + run-command API users: use "env" not "env_array" in comments & names
827
- + run-command API: rename "env_array" to "env"
828
-
829
- Rename .env_array member to .env in the child_process structure.
830
-
831
- Will merge to 'master'.
832
- source: <cover-v3-0.2-00000000000-20220602T090745Z-avarab@gmail.com>
833
-
834
-
835
-* jh/builtin-fsmonitor-part3 (2022-05-26) 31 commits
836
- (merged to 'next' on 2022-06-02 at 3599e359b3)
837
- + t7527: improve implicit shutdown testing in fsmonitor--daemon
838
- + fsmonitor--daemon: allow --super-prefix argument
839
- + t7527: test Unicode NFC/NFD handling on MacOS
840
- + t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
841
- + t/helper/hexdump: add helper to print hexdump of stdin
842
- + fsmonitor: on macOS also emit NFC spelling for NFD pathname
843
- + t7527: test FSMonitor on case insensitive+preserving file system
844
- + fsmonitor: never set CE_FSMONITOR_VALID on submodules
845
- + t/perf/p7527: add perf test for builtin FSMonitor
846
- + t7527: FSMonitor tests for directory moves
847
- + fsmonitor: optimize processing of directory events
848
- + fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
849
- + fsm-health-win32: force shutdown daemon if worktree root moves
850
- + fsm-health-win32: add polling framework to monitor daemon health
851
- + fsmonitor--daemon: stub in health thread
852
- + fsmonitor--daemon: rename listener thread related variables
853
- + fsmonitor--daemon: prepare for adding health thread
854
- + fsmonitor--daemon: cd out of worktree root
855
- + fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
856
- + unpack-trees: initialize fsmonitor_has_run_once in o->result
857
- + fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
858
- + fsmonitor-settings: remote repos on Windows are incompatible
859
- + fsmonitor-settings: remote repos on macOS are incompatible
860
- + fsmonitor-settings: stub in macOS-specific incompatibility checking
861
- + fsmonitor-settings: VFS for Git virtual repos are incompatible
862
- + fsmonitor-settings: stub in Win32-specific incompatibility checking
863
- + fsmonitor-settings: bare repos are incompatible with FSMonitor
864
- + t/helper/fsmonitor-client: create stress test
865
- + t7527: test FSMonitor on repos with Unicode root paths
866
- + fsm-listen-win32: handle shortnames
867
- + Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
868
-
869
- More fsmonitor--daemon.
870
-
871
- Will merge to 'master'.
872
- source: <pull.1143.v9.git.1653601644.gitgitgadget@gmail.com>
873
-
619
--------------------------------------------------
620
[Discarded]
621
877
-* jx/uniq-source-list (2022-05-25) 1 commit
878
- . Makefile: dedup git-ls-files output to prevent duplicate targets
879
-
880
- Build fix.
881
-
882
- Will discard.
883
- No longer needed with the updated jx/l10n-workflow-change.
884
- source: <20220526021540.2812-1-worldhello.net@gmail.com>
885
-
886
-
887
-* et/xdiff-indirection (2022-02-17) 1 commit
888
- . xdiff: provide indirection to git functions
889
-
890
- Insert a layer of preprocessor macros for common functions in xdiff
891
- codebase.
892
-
893
- Will discard, as it has been stalled for way too long.
894
- cf. <xmqqbkyudb8n.fsf@gitster.g>
895
- source: <20220217225408.GB7@edef91d97c94>
896
-
897
-
898
-* dl/prompt-pick-fix (2022-03-25) 1 commit
899
- . git-prompt: fix sequencer/todo detection
900
-
901
- Fix shell prompt script (in contrib/) for those who set
902
- rebase.abbreviateCommands; we failed to recognize that we were in a
903
- multi-step cherry-pick session.
904
-
905
- Will discard, as it has been stalled for way too long.
906
- cf. <xmqqwngdzque.fsf@gitster.g>
907
- source: <20220325145301.3370-1-danny0838@gmail.com>
622
+* ds/rebase-update-refs (2022-06-07) 7 commits
623
+ . rebase: add rebase.updateRefs config option
624
+ . sequencer: implement 'update-refs' command
625
+ . rebase: add --update-refs option
626
+ . sequencer: add update-refs command
627
+ . sequencer: define array with enum values
628
+ . branch: add branch_checked_out() helper
629
+ . log-tree: create for_each_decoration()
630
631
+ "git rebase" learns "--update-refs" to update the refs that point
632
+ at commits being rewritten so that they point at the corresponding
633
+ commits in the rewritten history.
634
910
-* es/superproject-aware-submodules (2022-03-09) 3 commits
911
- . rev-parse: short-circuit superproject worktree when config unset
912
- . introduce submodule.hasSuperproject record
913
- . t7400-submodule-basic: modernize inspect() helper
635
+ Retracted for possible future redesign.
636
+ cf. <pull.1254.git.1654718942.gitgitgadget@gmail.com>
637
+ source: <pull.1247.v2.git.1654634569.gitgitgadget@gmail.com>
638
915
- A configuration variable in a repository tells if it is (or is not)
916
- a submodule of a superproject.
639
918
- Will discard, as it has been stalled for way too long.
919
- cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
920
- source: <20220310004423.2627181-1-emilyshaffer@google.com>
640
+* ab/ci-github-workflow-markup (2022-05-26) 14 commits
641
+ . CI: make the --github-workflow-markup "github" output the default
642
+ . CI: make --github-workflow-markup ci-config, off by default
643
+ . ci: call `finalize_test_case_output` a little later
644
+ . ci(github): mention where the full logs can be found
645
+ . ci(github): avoid printing test case preamble twice
646
+ . ci(github): skip "skip" tests in --github-workflow-markup
647
+ . ci(github): skip the logs of the successful test cases
648
+ . ci: make it easier to find failed tests' logs in the GitHub workflow
649
+ . ci: optionally mark up output in the GitHub workflow
650
+ . test(junit): avoid line feeds in XML attributes
651
+ . tests: refactor --write-junit-xml code
652
+ . CI: stop setting FAILED_TEST_ARTIFACTS N times
653
+ . CI: don't include "test-results/" in ci/print-test-failures.sh output
654
+ . CI: don't "cd" in ci/print-test-failures.sh
655
+ (this branch uses ab/ci-setup-simplify.)
656
657
+ Discarded to stop "competing" with js/ci-github-workflow-markup.
658
923
-* sg/build-gitweb (2022-05-25) 1 commit
924
- . Makefile: build 'gitweb' in the default target
659
926
- "make all" should but didn't build "gitweb".
660
+* ab/ci-setup-simplify (2022-05-26) 29 commits
661
+ . CI: make it easy to use ci/*.sh outside of CI
662
+ . CI: don't use "set -x" in "ci/lib.sh" output
663
+ . CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
664
+ . CI: set SANITIZE=leak in MAKEFLAGS directly
665
+ . CI: set CC in MAKEFLAGS directly, don't add it to the environment
666
+ . CI: add more variables to MAKEFLAGS, except under vs-build
667
+ . CI: narrow down variable definitions in --build and --test
668
+ . CI: only invoke ci/lib.sh as "steps" in main.yml
669
+ . CI: pre-select test slice in Windows & VS tests
670
+ . ci/run-test-slice.sh: replace shelling out with "echo"
671
+ . CI: move "env" definitions into ci/lib.sh
672
+ . CI: combine ci/install{,-docker}-dependencies.sh
673
+ . CI: split up and reduce "ci/test-documentation.sh"
674
+ . CI: invoke "make artifacts-tar" directly in windows-build
675
+ . CI: check ignored unignored build artifacts in "win[+VS] build" too
676
+ . CI: make ci/{lib,install-dependencies}.sh POSIX-compatible
677
+ . CI: remove "run-build-and-tests.sh", run "make [test]" directly
678
+ . CI: export variables via a wrapper
679
+ . CI: consistently use "export" in ci/lib.sh
680
+ . CI: move p4 and git-lfs variables to ci/install-dependencies.sh
681
+ . CI: have "static-analysis" run "check-builtins", not "documentation"
682
+ . CI: have "static-analysis" run a "make ci-static-analysis" target
683
+ . CI: don't have "git grep" invoke a pager in tree content check
684
+ . CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS
685
+ . CI: remove unused Azure ci/* code
686
+ . CI: remove dead "tree skipping" code
687
+ . CI: remove more dead Travis CI support
688
+ . CI: make "$jobname" explicit, remove fallback
689
+ . CI: run "set -ex" early in ci/lib.sh
690
+ (this branch is used by ab/ci-github-workflow-markup.)
691
928
- Will discard.
929
- cf. <220526.86k0a96sv2.gmgdl@evledraar.gmail.com>
930
- cf. <Yo8y3AHWa3PChLwd@coredump.intra.peff.net>
931
- source: <20220525205651.825669-1-szeder.dev@gmail.com>
692
+ Discarded to stop "conflicing" with js/ci-github-workflow-markup;
693
+ good bits from the series may want to be resurrected and rebuilt on
694
+ top of the other topics.