What's cooking (2021/09 #03)
Junio C Hamano committed
Sep 10, 2021 at 15:07 UTC
6b756ca743abbbf952fc5d927cfe6287b2718ebf
1 file changed
+748
-765
whats-cooking.txt
+748
-765
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2021, #02; Wed, 8)
4
-X-master-at: e0a2f5cbc585657e757385ad918f167f519cfb96
5
-X-next-at: be952f7c3b737964aa95523b0a01473c6e35c5c9
3
+Subject: What's cooking in git.git (Sep 2021, #03; Fri, 10)
4
+X-master-at: 8b7c11b8668b4e774f81a9f0b4c30144b818f1d1
5
+X-next-at: 5e29049d33d12c9bf75c9b7214e9d7d19bb2e7fe
6
7
-What's cooking in git.git (Sep 2021, #02; Wed, 8)
7
+What's cooking in git.git (Sep 2021, #03; Fri, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,270 +49,517 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[Graduated to 'master']
51
52
-* ab/santize-leak-ci (2021-09-07) 3 commits
53
- - tests: add a test mode for SANITIZE=leak, run it in CI
54
- - CI: refactor "if" to "case" statement
55
- - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS
52
+* ab/commit-graph-usage (2021-08-30) 7 commits
53
+ (merged to 'next' on 2021-09-03 at 2254ea1e58)
54
+ + commit-graph: show "unexpected subcommand" error
55
+ + commit-graph: show usage on "commit-graph [write|verify] garbage"
56
+ + commit-graph: early exit to "usage" on !argc
57
+ + multi-pack-index: refactor "goto usage" pattern
58
+ + commit-graph: use parse_options_concat()
59
+ + commit-graph: remove redundant handling of -h
60
+ + commit-graph: define common usage with a macro
61
57
- CI learns to run the leak sanitizer builds.
62
+ Fixes on usage message from "git commit-graph".
63
59
- Will merge to 'next'?
64
+
65
+* ab/gc-log-rephrase (2021-09-02) 1 commit
66
+ (merged to 'next' on 2021-09-03 at 24c51e3df1)
67
+ + gc: remove trailing dot from "gc.log" line
68
+
69
+ A pathname in an advice message has been made cut-and-paste ready.
70
+
71
+
72
+* ab/help-autocorrect-prompt (2021-08-14) 1 commit
73
+ (merged to 'next' on 2021-09-08 at e9e130d3e6)
74
+ + help.c: help.autocorrect=prompt waits for user action
75
+
76
+ The logic for auto-correction of misspelt subcommands learned to go
77
+ interactive when the help.autocorrect configuration variable is set
78
+ to 'prompt'.
79
+
80
+
81
+* ab/ls-remote-packet-trace (2021-08-24) 1 commit
82
+ (merged to 'next' on 2021-08-30 at fec2e5a7eb)
83
+ + ls-remote: set packet_trace_identity(<name>)
84
+
85
+ Debugging aid fix.
86
87
62
-* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit
63
- (merged to 'next' on 2021-08-24 at afdbb7ee8d)
64
- + ci: use upload-artifacts v1 for dockerized jobs
88
+* ab/mailmap-leakfix (2021-08-31) 1 commit
89
+ (merged to 'next' on 2021-09-03 at 348fe07b87)
90
+ + mailmap.c: fix a memory leak in free_mailap_{info,entry}()
91
66
- Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
67
- new version has a blocker bug for that architecture.
92
+ Leakfix.
93
94
70
-* fc/completion-updates (2021-08-18) 4 commits
71
- (merged to 'next' on 2021-08-24 at 593cd75c64)
72
- + completion: bash: add correct suffix in variables
73
- + completion: bash: fix for multiple dash commands
74
- + completion: bash: fix for suboptions with value
75
- + completion: bash: fix prefix detection in branch.*
95
+* ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit
96
+ (merged to 'next' on 2021-08-30 at 256e1cbc9e)
97
+ + rebase: emit one "fatal" in "fatal: fatal: <error>"
98
77
- Command line completion updates.
99
+ Error message fix.
100
101
80
-* jk/commit-edit-fixup-fix (2021-08-15) 1 commit
81
- (merged to 'next' on 2021-08-24 at 0c625438c3)
82
- + commit: restore --edit when combined with --fixup
102
+* ab/retire-advice-config (2021-08-25) 4 commits
103
+ (merged to 'next' on 2021-09-03 at 0045df3dbb)
104
+ + advice: move advice.graftFileDeprecated squashing to commit.[ch]
105
+ + advice: remove use of global advice_add_embedded_repo
106
+ + advice: remove read uses of most global `advice_` variables
107
+ + advice: add enum variants for missing advice variables
108
84
- "git commit --fixup" now works with "--edit" again, after it was
85
- broken in v2.32.
109
+ Code clean up to migrate callers from older advice_config[] based
110
+ API to newer advice_if_enabled() and advice_enabled() API.
111
112
88
-* ps/connectivity-optim (2021-08-09) 5 commits
89
- (merged to 'next' on 2021-08-24 at 94a7a04ca4)
90
- + revision: avoid hitting packfiles when commits are in commit-graph
91
- + commit-graph: split out function to search commit position
92
- + revision: stop retrieving reference twice
93
- + connected: do not sort input revisions
94
- + revision: separate walk and unsorted flags
113
+* ba/object-info (2021-08-31) 1 commit
114
+ (merged to 'next' on 2021-09-03 at 6d47f59ab4)
115
+ + protocol-caps.c: fix memory leak in send_info()
116
96
- The revision traversal API has been optimized by taking advantage
97
- of the commit-graph, when available, to determine if a commit is
98
- reachable from any of the existing refs.
117
+ Leakfix.
118
119
101
-* pw/rebase-r-fixes (2021-08-23) 4 commits
102
- (merged to 'next' on 2021-08-24 at 81c6aff70a)
103
- + rebase -r: fix merge -c with a merge strategy
104
- + rebase -r: don't write .git/MERGE_MSG when fast-forwarding
105
- + rebase -i: add another reword test
106
- + rebase -r: make 'merge -c' behave like reword
120
+* cb/ci-build-pedantic (2021-08-11) 1 commit
121
+ (merged to 'next' on 2021-09-08 at c47fb2d7cc)
122
+ + ci: run a pedantic build as part of the GitHub workflow
123
108
- Various bugs in "git rebase -r" have been fixed.
124
+ CI update.
125
126
111
-* pw/rebase-skip-final-fix (2021-08-13) 3 commits
112
- (merged to 'next' on 2021-08-24 at 73ec41e9dd)
113
- + rebase --continue: remove .git/MERGE_MSG
114
- + rebase --apply: restore some tests
115
- + t3403: fix commit authorship
127
+* cb/makefile-apple-clang (2021-08-06) 3 commits
128
+ (merged to 'next' on 2021-08-30 at 9fe8f1a9b3)
129
+ + build: catch clang that identifies itself as "$VENDOR clang"
130
+ + build: clang version may not be followed by extra words
131
+ + build: update detect-compiler for newer Xcode version
132
117
- Checking out all the paths from HEAD during the last conflicted
118
- step in "git rebase" and continuing would cause the step to be
119
- skipped (which is expected), but leaves MERGE_MSG file behind in
120
- $GIT_DIR and confuses the next "git commit", which has been
121
- corrected.
133
+ Build update for Apple clang.
134
135
124
-* sg/make-fix-ar-invocation (2021-08-19) 1 commit
125
- (merged to 'next' on 2021-08-24 at 9a3df9ec56)
126
- + Makefile: remove archives before manipulating them with 'ar'
136
+* cb/remote-ndebug-fix (2021-09-02) 1 commit
137
+ (merged to 'next' on 2021-09-03 at a47f44ca9d)
138
+ + remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG
139
140
Build fix.
141
142
131
-* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit
132
- (merged to 'next' on 2021-08-24 at 8fa66cf037)
133
- + completion: tcsh: Fix regression by drop of wrapper functions
143
+* dd/diff-files-unmerged-fix (2021-08-25) 1 commit
144
+ (merged to 'next' on 2021-08-30 at 63a1bdddfc)
145
+ + diff-lib: ignore paths that are outside $cwd if --relative asked
146
135
- Update to the command line completion (in contrib/) for tcsh.
147
+ "git diff --relative" segfaulted and/or produced incorrect result
148
+ when there are unmerged paths.
149
137
---------------------------------------------------
138
-[New Topics]
150
140
-* bs/install-strip (2021-09-05) 1 commit
141
- - make: add INSTALL_STRIP option variable
151
+* dd/t6300-wo-gpg-fix (2021-08-25) 2 commits
152
+ (merged to 'next' on 2021-08-30 at 59f5669dd6)
153
+ + t6300: check for cat-file exit status code
154
+ + t6300: don't run cat-file on non-existent object
155
143
- "make INSTALL_STRIP=-s install" allows the installation step to use
144
- "install -s" to strip the binaries as they get installed.
156
+ Test fix.
157
146
- Will merge to 'next'.
158
159
+* es/walken-tutorial-fix (2021-08-30) 1 commit
160
+ (merged to 'next' on 2021-09-01 at 73719bee8a)
161
+ + doc: fix syntax error and the format of printf
162
149
-* cb/pedantic-build-for-developers (2021-09-03) 3 commits
150
- - developer: enable pedantic by default
151
- - win32: allow building with pedantic mode enabled
152
- - gettext: remove optional non-standard parens in N_() definition
163
+ Typofix.
164
154
- Update the build procedure to use the "-pedantic" build when
155
- DEVELOPER makefile macro is in effect.
165
157
- Will merge to 'next'?
166
+* ga/send-email-sendmail-cmd (2021-08-24) 1 commit
167
+ (merged to 'next' on 2021-08-30 at 1bb659c66c)
168
+ + t9001: PATH must not use Windows-style paths
169
170
+ Test fix.
171
160
-* js/scalar (2021-09-03) 15 commits
161
- - scalar: accept -C and -c options before the subcommand
162
- - scalar: implement the `version` command
163
- - scalar: implement the `delete` command
164
- - scalar: teach 'reconfigure' to optionally handle all registered enlistments
165
- - scalar: allow reconfiguring an existing enlistment
166
- - scalar: implement the `run` command
167
- - scalar: teach 'clone' to support the --single-branch option
168
- - scalar: implement the `clone` subcommand
169
- - scalar: implement 'scalar list'
170
- - scalar: let 'unregister' handle a deleted enlistment directory gracefully
171
- - scalar: 'unregister' stops background maintenance
172
- - scalar: 'register' sets recommended config and starts maintenance
173
- - scalar: create test infrastructure
174
- - scalar: start documenting the command
175
- - scalar: create a rudimentary executable
172
177
- Add pieces from "scalar" to contrib/.
173
+* gh/gitweb-branch-sort (2021-06-10) 1 commit
174
+ (merged to 'next' on 2021-09-08 at a51cf7e283)
175
+ + gitweb: use HEAD as secondary sort key in git_get_heads_list()
176
177
+ Tie-break branches that point at the same object in the list of
178
+ branches on GitWeb to show the one pointed at by HEAD early.
179
180
-* ps/update-ref-batch-flush (2021-09-03) 1 commit
181
- - update-ref: fix streaming of status updates
180
183
- "git update-ref --stdin" failed to flush its output as needed,
184
- which potentially led the conversation to a deadlock.
181
+* jb/midx-revindex-fix (2021-08-23) 1 commit
182
+ - multi-pack-index: fix *.rev cleanups with --object-dir
183
186
- Will merge to 'next'?
184
+ An implementation in "multi-pack-index write" that takes object
185
+ directory inconsistently used that and the object store of the
186
+ default repository, causing segfaults and possibly corrupting
187
+ repositories.
188
189
+ Discard. This has been absorbed in another topic.
190
+ cf. <c0c24993-77e2-51a1-c352-0399c59f1f94@ramsayjones.plus.com>
191
189
-* ab/no-more-check-bindir (2021-09-07) 1 commit
190
- - Makefile: remove the check_bindir script
192
192
- Build simplification.
193
+* jh/sparse-index-resize-fix (2021-08-30) 1 commit
194
+ (merged to 'next' on 2021-09-01 at 5ee2615670)
195
+ + sparse-index: copy dir_hash in ensure_full_index()
196
194
- Will merge to 'next'.
197
+ The sparse-index support can corrupt the index structure by storing
198
+ a stale and/or uninitialized data, which has been corrected.
199
200
197
-* ab/send-email-config-fix (2021-09-07) 1 commit
198
- - send-email: fix a "first config key wins" regression in v2.33.0
201
+* jk/log-warn-on-bogus-encoding (2021-08-27) 2 commits
202
+ (merged to 'next' on 2021-09-08 at 56fe25cc53)
203
+ + docs: use "character encoding" to refer to commit-object encoding
204
+ + logmsg_reencode(): warn when iconv() fails
205
200
- Regression fix.
206
+ Doc update plus improved error reporting.
207
202
- Will merge to 'next' and then to 'master'.
208
209
+* jk/t5323-no-pack-test-fix (2021-08-25) 1 commit
210
+ (merged to 'next' on 2021-08-30 at 2892635eaf)
211
+ + t5323: drop mentions of "master"
212
205
-* ab/tr2-leaks-and-fixes (2021-09-07) 6 commits
206
- - tr2: log N parent process names on Linux
207
- - tr2: do compiler enum check in trace2_collect_process_info()
208
- - tr2: leave the parent list empty upon failure & don't leak memory
209
- - tr2: stop leaking "thread_name" memory
210
- - tr2: clarify TRACE2_PROCESS_INFO_EXIT comment under Linux
211
- - tr2: remove NEEDSWORK comment for "non-procfs" implementations
213
+ Test fix.
214
213
- The tracing of process ancestry information has been enhanced.
215
215
- Will merge to 'next'.
216
+* js/advise-when-skipping-cherry-picked (2021-08-30) 1 commit
217
+ (merged to 'next' on 2021-09-01 at bc883fce56)
218
+ + sequencer: advise if skipping cherry-picked commit
219
220
+ "git rebase" by default skips changes that are equivalent to
221
+ commits that are already in the history the branch is rebased onto;
222
+ give messages when this happens to let the users be aware of
223
+ skipped commits, and also teach them how to tell "rebase" to keep
224
+ duplicated changes.
225
218
-* bs/doc-bugreport-outdir (2021-09-07) 1 commit
219
- - Documentation: fix default directory of git bugreport -o
226
221
- Docfix.
227
+* js/maintenance-launchctl-fix (2021-08-24) 2 commits
228
+ (merged to 'next' on 2021-08-30 at 12a5da47e7)
229
+ + maintenance: skip bootout/bootstrap when plist is registered
230
+ + maintenance: create `launchctl` configuration using a lock file
231
223
- Will merge to 'next'.
232
+ "git maintenance" scheduler fix for macOS.
233
234
226
-* jc/prefix-filename-allocates (2021-09-07) 1 commit
227
- - hash-object: prefix_filename() returns allocated memory these days
235
+* ka/want-ref-in-namespace (2021-09-01) 3 commits
236
+ (merged to 'next' on 2021-09-01 at a1075a92a9)
237
+ + docs: clarify the interaction of transfer.hideRefs and namespaces
238
+ + upload-pack.c: treat want-ref relative to namespace
239
+ + t5730: introduce fetch command helper
240
229
- Leakfix.
241
+ "git upload-pack" which runs on the other side of "git fetch"
242
+ forgot to take the ref namespaces into account when handling
243
+ want-ref requests.
244
231
- Will merge to 'next'?
245
246
+* me/t5582-cleanup (2021-08-24) 1 commit
247
+ (merged to 'next' on 2021-08-30 at e92258e72c)
248
+ + t5582: remove spurious 'cd "$D"' line
249
234
-* kr/doc-webserver-config-for-v2 (2021-09-07) 1 commit
235
- - Docs: web server must setenv GIT_PROTOCOL for v2
250
+ Test fix.
251
237
- Hints to set GIT_PROTOCOL environment in various CGI environments
238
- are added to the documentation.
252
240
- Will merge to 'next'?
253
+* mh/credential-leakfix (2021-08-25) 1 commit
254
+ (merged to 'next' on 2021-08-30 at be9e67bddc)
255
+ + credential: fix leak in credential_apply_config()
256
257
+ Leak fix.
258
243
-* rs/range-diff-avoid-segfault-with-I (2021-09-07) 1 commit
244
- - range-diff: avoid segfault with -I
259
246
- "git range-diff -I... <range> <range>" segfaulted, which has been
247
- corrected.
260
+* mh/send-email-reset-in-reply-to (2021-08-30) 1 commit
261
+ (merged to 'next' on 2021-09-03 at 3a60892d9a)
262
+ + send-email: avoid incorrect header propagation
263
249
- Will merge to 'next'?
264
+ Even when running "git send-email" without its own threaded
265
+ discussion support, a threading related header in one message is
266
+ carried over to the subsequent message to result in an unwanted
267
+ threading, which has been corrected.
268
269
252
-* so/diff-index-regression-fix (2021-09-07) 1 commit
253
- - diff-index: restore -c/--cc options handling
270
+* mk/clone-recurse-submodules (2021-08-30) 1 commit
271
+ (merged to 'next' on 2021-09-03 at 9787178599)
272
+ + clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
273
255
- Recent "diff -m" changes broke "gitk", which has been corrected.
274
+ After "git clone --recurse-submodules", all submodules are cloned
275
+ but they are not by default recursed into by other commands. With
276
+ submodule.stickyRecursiveClone configuration set, submodule.recurse
277
+ configuration is set to true in a repository created by "clone"
278
+ with "--recurse-submodules" option.
279
257
- Will merge to 'next' and then to 'master'.
280
281
+* mt/quiet-with-delayed-checkout (2021-08-26) 1 commit
282
+ (merged to 'next' on 2021-08-30 at d243498893)
283
+ + checkout: make delayed checkout respect --quiet and --no-progress
284
260
-* tb/pack-finalize-ordering (2021-09-07) 2 commits
261
- - builtin/repack.c: move `.idx` files into place last
262
- - pack-write.c: rename `.idx` file into place last
285
+ The delayed checkout code path in "git checkout" etc. were chatty
286
+ even when --quiet and/or --no-progress options were given.
287
264
- The order in which various files that make up a single (conceptual)
265
- packfile has been reevaluated and straightened up. This matters in
266
- correctness, as an incomplete set of files must not be shown to a
267
- running Git.
288
269
- Will merge to 'next'?
289
+* ps/fetch-omit-formatting-under-quiet (2021-08-30) 1 commit
290
+ (merged to 'next' on 2021-09-01 at 2440a8a2aa)
291
+ + fetch: skip formatting updated refs with `--quiet`
292
293
+ "git fetch --quiet" optimization to avoid useless computation of
294
+ info that will never be displayed.
295
272
-* ab/reverse-midx-optim (2021-09-07) 1 commit
273
- - pack-write: skip *.rev work when not writing *.rev
296
297
+* ps/ls-refs-strbuf-optim (2021-08-25) 1 commit
298
+ (merged to 'next' on 2021-08-30 at e4cbc7243a)
299
+ + ls-refs: reuse buffer when sending refs
300
276
-* ab/sanitize-leak-ci (2021-09-07) 3 commits
277
- - tests: add a test mode for SANITIZE=leak, run it in CI
278
- - CI: refactor "if" to "case" statement
279
- - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS
301
+ Micro-optimization for the wire protocol driver.
302
281
---------------------------------------------------
282
-[Stalled]
303
284
-* es/config-based-hooks (2021-08-19) 7 commits
285
- - hook: allow out-of-repo 'git hook' invocations
286
- - hook: include hooks from the config
287
- - hook: allow running non-native hooks
288
- - hook: introduce "git hook list"
289
- - hook: allow parallel hook execution
290
- - hook: run a list of hooks instead
291
- - Merge branch 'ab/config-based-hooks-base' into es/config-based-hooks
292
- (this branch uses ab/config-based-hooks-base.)
304
+* rs/archive-use-object-id (2021-08-27) 1 commit
305
+ (merged to 'next' on 2021-09-08 at 02899d8aea)
306
+ + archive: convert queue_directory to struct object_id
307
294
- Revamp the hooks subsystem to allow multiple of them to trigger
295
- upon the same event and control via the configuration variables.
308
+ Code cleanup.
309
297
- Expecting a reroll
298
- but ab/config-based-hooks-base needs to be in a better shape first.
299
- cf. <87v93wflm0.fsf@evledraar.gmail.com>
300
- cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
310
311
+* rs/branch-allow-deleting-dangling (2021-08-27) 1 commit
312
+ (merged to 'next' on 2021-08-30 at 35b9d158e8)
313
+ + branch: allow deleting dangling branches with --force
314
303
-* jh/builtin-fsmonitor (2021-09-03) 37 commits
304
- - fixup! fsmonitor--daemon: implement handle_client callback
305
- - SQUASH??? https://github.com/git/git/runs/3438543601?check_suite_focus=true#step:5:136
306
- - BANDAID: sparse fixes
307
- - t7527: test FS event reporing on MacOS WRT case and Unicode
308
- - fsmonitor: handle shortname for .git
309
- - t7527: test status with untracked-cache and fsmonitor--daemon
310
- - fsmonitor: force update index after large responses
311
- - fsmonitor: enhance existing comments
312
- - fsmonitor--daemon: use a cookie file to sync with file system
313
- - fsmonitor--daemon: periodically truncate list of modified files
314
- - t7527: create test for fsmonitor--daemon
315
- - t/perf/p7519: add fsmonitor--daemon test cases
315
+ "git branch -D <branch>" used to refuse to remove a broken branch
316
+ ref that points at a missing commit, which has been corrected.
317
+
318
+
319
+* rs/git-mmap-uses-malloc (2021-08-24) 1 commit
320
+ (merged to 'next' on 2021-08-30 at 6339c8e657)
321
+ + compat: let git_mmap use malloc(3) directly
322
+
323
+ mmap() imitation used to call xmalloc() that dies upon malloc()
324
+ failure, which has been corrected to just return an error to the
325
+ caller to be handled.
326
+
327
+
328
+* rs/more-fspathcmp (2021-08-30) 1 commit
329
+ (merged to 'next' on 2021-09-01 at 3052b89438)
330
+ + merge-recursive: use fspathcmp() in path_hashmap_cmp()
331
+
332
+ Code simplification.
333
+
334
+
335
+* rs/show-branch-simplify (2021-08-27) 1 commit
336
+ (merged to 'next' on 2021-09-08 at 047750a6fa)
337
+ + show-branch: simplify rev_is_head()
338
+
339
+ Code cleanup.
340
+
341
+
342
+* rs/xopen-reports-open-failures (2021-08-25) 2 commits
343
+ (merged to 'next' on 2021-08-30 at a8588775c8)
344
+ + use xopen() to handle fatal open(2) failures
345
+ + xopen: explicitly report creation failures
346
+
347
+ Error diagnostics improvement.
348
+
349
+
350
+* sg/column-nl (2021-08-26) 1 commit
351
+ (merged to 'next' on 2021-08-30 at a3cb0f4745)
352
+ + column: fix parsing of the '--nl' option
353
+
354
+ The parser for the "--nl" option of "git column" has been
355
+ corrected.
356
+
357
+
358
+* sg/set-ceiling-during-tests (2021-08-30) 1 commit
359
+ (merged to 'next' on 2021-09-01 at 5378ce3817)
360
+ + test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
361
+
362
+ Buggy tests could damage repositories outside the throw-away test
363
+ area we created. We now by default export GIT_CEILING_DIRECTORIES
364
+ to limit the damage from such a stray test.
365
+
366
+
367
+* tb/add-objects-in-unpacked-packs-simplify (2021-08-29) 3 commits
368
+ (merged to 'next' on 2021-09-01 at 66b0f8564d)
369
+ + builtin/pack-objects.c: remove duplicate hash lookup
370
+ + builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
371
+ + object-store.h: teach for_each_packed_object to ignore kept packs
372
+
373
+ Code simplification with reduced memory usage.
374
+
375
+
376
+* tk/fast-export-anonymized-tag-fix (2021-08-31) 1 commit
377
+ (merged to 'next' on 2021-09-03 at 15ce1ab44f)
378
+ + fast-export: fix anonymized tag using original length
379
+
380
+ The output from "git fast-export", when its anonymization feature
381
+ is in use, showed an annotated tag incorrectly.
382
+
383
+
384
+* uk/userdiff-php-enum (2021-08-31) 1 commit
385
+ (merged to 'next' on 2021-09-03 at 5c9eb654fe)
386
+ + userdiff: support enum keyword in PHP hunk header
387
+
388
+ Update the userdiff pattern for PHP.
389
+
390
+
391
+* zh/cherry-pick-advice (2021-08-23) 1 commit
392
+ (merged to 'next' on 2021-09-01 at 6ff491cc09)
393
+ + cherry-pick: use better advice message
394
+
395
+ The advice message that "git cherry-pick" gives when it asks
396
+ conflicted replay of a commit to be resolved by the end user has
397
+ been updated.
398
+
399
+--------------------------------------------------
400
+[New Topics]
401
+
402
+* en/stash-df-fix (2021-09-08) 3 commits
403
+ - stash: restore untracked files AFTER restoring tracked files
404
+ - stash: avoid feeding directories to update-index
405
+ - t3903: document a pair of directory/file bugs
406
+
407
+ Fix "git stash" corner case where the tentative change involves
408
+ changing a directory to a file (or vice versa).
409
+
410
+
411
+* js/pull-release-packs-before-fetching (2021-09-08) 2 commits
412
+ - pull: release packs before fetching
413
+ - commit-graph: when closing the graph, also release the slab
414
+ (this branch is used by js/run-command-close-packs.)
415
+
416
+ "git pull" was taught to close open file descriptors to the
417
+ packfiles before spawning "git fetch" to help auto-gc that may be
418
+ invoked by it.
419
+
420
+
421
+* ab/http-drop-old-curl-plus (2021-09-10) 8 commits
422
+ - http: don't hardcode the value of CURL_SOCKOPT_OK
423
+ - http: centralize the accounting of libcurl dependencies
424
+ - http: correct curl version check for CURLOPT_PINNEDPUBLICKEY
425
+ - http: correct version check for CURL_HTTP_VERSION_2
426
+ - http: drop support for curl < 7.18.0 (again)
427
+ - Makefile: drop support for curl < 7.9.8 (again)
428
+ - INSTALL: mention that we need libcurl 7.19.4 or newer to build
429
+ - INSTALL: don't mention the "curl" executable at all
430
+
431
+ Conditional compilation around versions of libcURL has been
432
+ straightened out.
433
+
434
+
435
+* ds/mergies-with-sparse-index (2021-09-09) 6 commits
436
+ - sparse-index: integrate with cherry-pick and rebase
437
+ - sequencer: ensure full index if not ORT strategy
438
+ - t1092: add cherry-pick, rebase tests
439
+ - merge-ort: expand only for out-of-cone conflicts
440
+ - merge: make sparse-aware with ORT
441
+ - diff: ignore sparse paths in diffstat
442
+ (this branch uses ds/sparse-index-ignored-files.)
443
+
444
+ Various mergy operations have been prepared to work efficiently
445
+ with the sparse index.
446
+
447
+ Will merge to 'next'.
448
+
449
+
450
+* jk/http-backend-handle-proto-header (2021-09-09) 1 commit
451
+ - http-backend: handle HTTP_GIT_PROTOCOL CGI variable
452
+
453
+ Taking advantage of the CGI interface, http-backend has been
454
+ updated to enable protocol v2 automatically when the other side
455
+ asks for it.
456
+
457
+ Will merge to 'next'.
458
+
459
+
460
+* js/run-command-close-packs (2021-09-09) 4 commits
461
+ - Close object store closer to spawning child processes
462
+ - run_auto_maintenance(): implicitly close the object store
463
+ - run-command: offer to close the object store before running
464
+ - run-command: prettify the `RUN_COMMAND_*` flags
465
+ (this branch uses js/pull-release-packs-before-fetching.)
466
+
467
+ The run-command API has been updated so that the callers can easily
468
+ ask the file descriptors open for packfiles to be closed immediately
469
+ before spawning commands that may trigger auto-gc.
470
+
471
+ Will merge to 'next'.
472
+
473
+
474
+* jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
475
+ - revision: remove "submodule" from opt struct
476
+ - repository: support unabsorbed in repo_submodule_init
477
+ - submodule: remove unnecessary unabsorbed fallback
478
+ (this branch uses jt/grep-wo-submodule-odb-as-alternate.)
479
+
480
+ More code paths that uses the hack to add submodule's object
481
+ database to the set of alternate object store have been cleaned up.
482
+
483
+
484
+* jx/ci-l10n (2021-09-09) 1 commit
485
+ - ci: new github-action for git-l10n code review
486
+
487
+ CI help for l10n.
488
+
489
+
490
+* jk/t5562-racefix (2021-09-09) 1 commit
491
+ - t5562: use alarm() to interrupt timed child-wait
492
+
493
+ Test update.
494
+
495
+ Will merge to 'next'.
496
+
497
+
498
+* rs/no-mode-to-open-when-appending (2021-09-09) 1 commit
499
+ - refs/files-backend: remove unused open mode parameter
500
+
501
+ The "mode" word is useless in a call to open(2) that does not
502
+ create a new file. Such a call in the files backend of the ref
503
+ subsystem has been cleaned up.
504
+
505
+ Will merge to 'next'.
506
+
507
+
508
+* rs/setup-use-xopen-and-xdup (2021-09-09) 1 commit
509
+ - setup: use xopen and xdup in sanitize_stdfds
510
+
511
+ Code clean-up.
512
+
513
+ Will merge to 'next'.
514
+
515
+
516
+* rs/use-xopen-in-index-pack (2021-09-10) 1 commit
517
+ - index-pack: use xopen in init_thread
518
+
519
+--------------------------------------------------
520
+[Stalled]
521
+
522
+* ab/pack-objects-stdin (2021-07-09) 5 commits
523
+ - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
524
+ - pack-objects.c: do stdin parsing via revision.c's API
525
+ - revision.[ch]: add a "handle_stdin_line" API
526
+ - revision.h: refactor "disable_stdin" and "read_from_stdin"
527
+ - upload-pack: run is_repository_shallow() before setup_revisions()
528
+
529
+ Introduce handle_stdin_line callback to revision API and uses it.
530
+
531
+ Waiting for reviews.
532
+
533
+
534
+* es/config-based-hooks (2021-09-09) 6 commits
535
+ - hook: allow out-of-repo 'git hook' invocations
536
+ - hook: include hooks from the config
537
+ - hook: introduce "git hook list"
538
+ - hook: allow parallel hook execution
539
+ - fixup! hook: run a list of hooks instead
540
+ - hook: run a list of hooks instead
541
+ (this branch uses ab/config-based-hooks-base.)
542
+
543
+ Revamp the hooks subsystem to allow multiple of them to trigger
544
+ upon the same event and control via the configuration variables.
545
+
546
+ On hold.
547
+ This is an interim one that goes with the updated ab/config-based-hooks-base.
548
+
549
+
550
+* jh/builtin-fsmonitor (2021-09-03) 37 commits
551
+ - fixup! fsmonitor--daemon: implement handle_client callback
552
+ - SQUASH??? https://github.com/git/git/runs/3438543601?check_suite_focus=true#step:5:136
553
+ - BANDAID: sparse fixes
554
+ - t7527: test FS event reporing on MacOS WRT case and Unicode
555
+ - fsmonitor: handle shortname for .git
556
+ - t7527: test status with untracked-cache and fsmonitor--daemon
557
+ - fsmonitor: force update index after large responses
558
+ - fsmonitor: enhance existing comments
559
+ - fsmonitor--daemon: use a cookie file to sync with file system
560
+ - fsmonitor--daemon: periodically truncate list of modified files
561
+ - t7527: create test for fsmonitor--daemon
562
+ - t/perf/p7519: add fsmonitor--daemon test cases
563
- t/perf: avoid copying builtin fsmonitor files into test repo
564
- t/perf/p7519: speed up test using "test-tool touch"
565
- t/helper/test-touch: add helper to touch a series of files
@@ -377,7 +624,9 @@ Release tarballs are available at:
624
switching to Python-3, too many things are expected to be in UTF-8,
625
which broke traditional use cases.
626
380
- Waiting for reviews.
627
+ Will discard.
628
+ Have been stalled for too long.
629
+ cf. <20210504220153.1d9f0cb2@ado-tr>
630
631
632
* tv/p4-fallback-encoding (2021-04-30) 1 commit
@@ -386,7 +635,9 @@ Release tarballs are available at:
635
"git p4" learns the fallbackEncoding configuration variable to
636
safely accept changeset descriptions that aren't written in UTF-8.
637
389
- Waiting for reviews.
638
+ Will discard.
639
+ Have been stalled for too long.
640
+ cf. <CAKu1iLUaLuAZWqjNK4tfhhR=YaSt4MdQ+90ZY-JcEh_SeHyYCw@mail.gmail.com>
641
642
643
* ab/fsck-unexpected-type (2021-09-07) 22 commits
@@ -421,551 +672,333 @@ Release tarballs are available at:
672
--------------------------------------------------
673
[Cooking]
674
424
-* jc/trivial-threeway-binary-merge (2021-09-05) 1 commit
425
- - apply: resolve trivial merge without hitting ll-merge with "--3way"
675
+* bs/install-strip (2021-09-05) 1 commit
676
+ (merged to 'next' on 2021-09-08 at 40cfa71c8d)
677
+ + make: add INSTALL_STRIP option variable
678
427
- The "git apply -3" code path learned not to bother the lower level
428
- merge machinery when the three-way merge can be trivially resolved
429
- without the content level merge.
679
+ "make INSTALL_STRIP=-s install" allows the installation step to use
680
+ "install -s" to strip the binaries as they get installed.
681
431
- Will merge to 'next'.
682
+ Will merge to 'master'.
683
684
434
-* gh/gitweb-branch-sort (2021-06-10) 1 commit
435
- - gitweb: use HEAD as secondary sort key in git_get_heads_list()
685
+* cb/pedantic-build-for-developers (2021-09-03) 3 commits
686
+ (merged to 'next' on 2021-09-10 at b8df102019)
687
+ + developer: enable pedantic by default
688
+ + win32: allow building with pedantic mode enabled
689
+ + gettext: remove optional non-standard parens in N_() definition
690
437
- Tie-break branches that point at the same object in the list of
438
- branches on GitWeb to show the one pointed at by HEAD early.
691
+ Update the build procedure to use the "-pedantic" build when
692
+ DEVELOPER makefile macro is in effect.
693
440
- Will merge to 'next'.
694
+ Will merge to 'master'.
695
696
443
-* ms/customizable-ident-expansion (2021-09-01) 1 commit
444
- - keyword expansion: make "$Id$" string configurable
697
+* js/scalar (2021-09-08) 15 commits
698
+ - scalar: accept -C and -c options before the subcommand
699
+ - scalar: implement the `version` command
700
+ - scalar: implement the `delete` command
701
+ - scalar: teach 'reconfigure' to optionally handle all registered enlistments
702
+ - scalar: allow reconfiguring an existing enlistment
703
+ - scalar: implement the `run` command
704
+ - scalar: teach 'clone' to support the --single-branch option
705
+ - scalar: implement the `clone` subcommand
706
+ - scalar: implement 'scalar list'
707
+ - scalar: let 'unregister' handle a deleted enlistment directory gracefully
708
+ - scalar: 'unregister' stops background maintenance
709
+ - scalar: 'register' sets recommended config and starts maintenance
710
+ - scalar: create test infrastructure
711
+ - scalar: start documenting the command
712
+ - scalar: create a rudimentary executable
713
446
- Instead of "$Id$", user-specified string (like $FreeBSD$) can be
447
- used as an in-blob placeholder for keyword expansion.
714
+ Add pieces from "scalar" to contrib/.
715
716
450
-* pb/test-use-user-env (2021-09-07) 3 commits
451
- - test-lib-functions: keep user's debugger config files and TERM in 'debug'
452
- - test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'
453
- - test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'
717
+* ps/update-ref-batch-flush (2021-09-03) 1 commit
718
+ (merged to 'next' on 2021-09-10 at 4ae19a5f34)
719
+ + update-ref: fix streaming of status updates
720
455
- Teach test_pause and test_debug to allow using the HOME and TERM
456
- environment variables the user usually uses.
721
+ "git update-ref --stdin" failed to flush its output as needed,
722
+ which potentially led the conversation to a deadlock.
723
458
- Will merge to 'next'?
724
+ Will merge to 'master'.
725
726
461
-* js/retire-preserve-merges (2021-09-07) 11 commits
462
- - sequencer: restrict scope of a formerly public function
463
- - rebase: remove a no-longer-used function
464
- - rebase: stop mentioning the -p option in comments
465
- - rebase: remove obsolete code comment
466
- - rebase: drop the internal `rebase--interactive` command
467
- - git-svn: drop support for `--preserve-merges`
468
- - rebase: drop support for `--preserve-merges`
469
- - pull: remove support for `--rebase=preserve`
470
- - tests: stop testing `git rebase --preserve-merges`
471
- - remote: warn about unhandled branch.<name>.rebase values
472
- - t5520: do not use `pull.rebase=preserve`
727
+* ab/no-more-check-bindir (2021-09-07) 1 commit
728
+ (merged to 'next' on 2021-09-08 at 4fddb3864f)
729
+ + Makefile: remove the check_bindir script
730
474
- The "--preserve-merges" option of "git rebase" has been removed.
731
+ Build simplification.
732
476
- Will merge to 'next'?
733
+ Will merge to 'master'.
734
735
479
-* cb/remote-ndebug-fix (2021-09-02) 1 commit
480
- (merged to 'next' on 2021-09-03 at a47f44ca9d)
481
- + remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG
736
+* ab/send-email-config-fix (2021-09-07) 1 commit
737
+ (merged to 'next' on 2021-09-08 at c2000e9689)
738
+ + send-email: fix a "first config key wins" regression in v2.33.0
739
483
- Build fix.
740
+ Regression fix.
741
742
Will merge to 'master'.
743
744
488
-* mr/bisect-in-c-4 (2021-09-02) 6 commits
489
- - bisect--helper: retire `--bisect-next-check` subcommand
490
- - bisect--helper: reimplement `bisect_run` shell
491
- - bisect--helper: reimplement `bisect_visualize()`shell function in C
492
- - run-command: make `exists_in_PATH()` non-static
493
- - t6030-bisect-porcelain: add test for bisect visualize
494
- - t6030-bisect-porcelain: add tests to control bisect run exit cases
745
+* ab/tr2-leaks-and-fixes (2021-09-07) 6 commits
746
+ (merged to 'next' on 2021-09-10 at 14f0dd5580)
747
+ + tr2: log N parent process names on Linux
748
+ + tr2: do compiler enum check in trace2_collect_process_info()
749
+ + tr2: leave the parent list empty upon failure & don't leak memory
750
+ + tr2: stop leaking "thread_name" memory
751
+ + tr2: clarify TRACE2_PROCESS_INFO_EXIT comment under Linux
752
+ + tr2: remove NEEDSWORK comment for "non-procfs" implementations
753
496
- Rewrite of "git bisect" in C continues.
754
+ The tracing of process ancestry information has been enhanced.
755
756
+ Will merge to 'master'.
757
499
-* tb/add-objects-in-unpacked-packs-simplify (2021-08-29) 3 commits
500
- (merged to 'next' on 2021-09-01 at 66b0f8564d)
501
- + builtin/pack-objects.c: remove duplicate hash lookup
502
- + builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
503
- + object-store.h: teach for_each_packed_object to ignore kept packs
758
505
- Code simplification with reduced memory usage.
759
+* bs/doc-bugreport-outdir (2021-09-07) 1 commit
760
+ (merged to 'next' on 2021-09-08 at 5ea3df204d)
761
+ + Documentation: fix default directory of git bugreport -o
762
+
763
+ Docfix.
764
765
Will merge to 'master'.
766
767
510
-* es/walken-tutorial-fix (2021-08-30) 1 commit
511
- (merged to 'next' on 2021-09-01 at 73719bee8a)
512
- + doc: fix syntax error and the format of printf
513
-
514
- Typofix.
515
-
516
- Will merge to 'master'.
517
-
518
-
519
-* jh/sparse-index-resize-fix (2021-08-30) 1 commit
520
- (merged to 'next' on 2021-09-01 at 5ee2615670)
521
- + sparse-index: copy dir_hash in ensure_full_index()
522
-
523
- The sparse-index support can corrupt the index structure by storing
524
- a stale and/or uninitialized data, which has been corrected.
525
-
526
- Will merge to 'master'.
527
-
528
-
529
-* mh/send-email-reset-in-reply-to (2021-08-30) 1 commit
530
- (merged to 'next' on 2021-09-03 at 3a60892d9a)
531
- + send-email: avoid incorrect header propagation
532
-
533
- Even when running "git send-email" without its own threaded
534
- discussion support, a threading related header in one message is
535
- carried over to the subsequent message to result in an unwanted
536
- threading, which has been corrected.
537
-
538
- Will merge to 'master'.
539
-
540
-
541
-* rs/more-fspathcmp (2021-08-30) 1 commit
542
- (merged to 'next' on 2021-09-01 at 3052b89438)
543
- + merge-recursive: use fspathcmp() in path_hashmap_cmp()
544
-
545
- Code simplification.
546
-
547
- Will merge to 'master'.
548
-
549
-
550
-* sg/set-ceiling-during-tests (2021-08-30) 1 commit
551
- (merged to 'next' on 2021-09-01 at 5378ce3817)
552
- + test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
553
-
554
- Buggy tests could damage repositories outside the throw-away test
555
- area we created. We now by default export GIT_CEILING_DIRECTORIES
556
- to limit the damage from such a stray test.
557
-
558
- Will merge to 'master'.
559
-
560
-
561
-* ab/gc-log-rephrase (2021-09-02) 1 commit
562
- (merged to 'next' on 2021-09-03 at 24c51e3df1)
563
- + gc: remove trailing dot from "gc.log" line
564
-
565
- A pathname in an advice message has been made cut-and-paste ready.
566
-
567
- Will merge to 'master'.
568
-
569
-
570
-* ab/mailmap-leakfix (2021-08-31) 1 commit
571
- (merged to 'next' on 2021-09-03 at 348fe07b87)
572
- + mailmap.c: fix a memory leak in free_mailap_{info,entry}()
573
-
574
- Leakfix.
575
-
576
- Will merge to 'master'.
577
-
578
-
579
-* ba/object-info (2021-08-31) 1 commit
580
- (merged to 'next' on 2021-09-03 at 6d47f59ab4)
581
- + protocol-caps.c: fix memory leak in send_info()
768
+* jc/prefix-filename-allocates (2021-09-07) 1 commit
769
+ (merged to 'next' on 2021-09-10 at a5221ea92e)
770
+ + hash-object: prefix_filename() returns allocated memory these days
771
772
Leakfix.
773
774
Will merge to 'master'.
775
776
588
-* en/remerge-diff (2021-08-31) 7 commits
589
- - doc/diff-options: explain the new --remerge-diff option
590
- - show, log: provide a --remerge-diff capability
591
- - tmp-objdir: new API for creating and removing primary object dirs
592
- - merge-ort: capture and print ll-merge warnings in our preferred fashion
593
- - ll-merge: add API for capturing warnings in a strbuf instead of stderr
594
- - merge-ort: add ability to record conflict messages in a file
595
- - merge-ort: mark a few more conflict messages as omittable
596
-
597
- A new presentation for two-parent merge "--remerge-diff" can be
598
- used to show the difference between mechanical (and possibly
599
- conflicted) merge results and the recorded resolution.
600
-
601
-
602
-* sg/test-split-index-fix (2021-09-07) 7 commits
603
- - read-cache: fix GIT_TEST_SPLIT_INDEX
604
- - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
605
- - read-cache: look for shared index files next to the index, too
606
- - t1600-index: disable GIT_TEST_SPLIT_INDEX
607
- - t1600-index: don't run git commands upstream of a pipe
608
- - t1600-index: remove unnecessary redirection
609
- - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
610
- (this branch uses ds/sparse-index-ignored-files.)
611
-
612
- Test updates.
613
-
614
-
615
-* tk/fast-export-anonymized-tag-fix (2021-08-31) 1 commit
616
- (merged to 'next' on 2021-09-03 at 15ce1ab44f)
617
- + fast-export: fix anonymized tag using original length
618
-
619
- The output from "git fast-export", when its anonymization feature
620
- is in use, showed an annotated tag incorrectly.
621
-
622
- Will merge to 'master'.
623
-
624
-
625
-* uk/userdiff-php-enum (2021-08-31) 1 commit
626
- (merged to 'next' on 2021-09-03 at 5c9eb654fe)
627
- + userdiff: support enum keyword in PHP hunk header
628
-
629
- Update the userdiff pattern for PHP.
630
-
631
- Will merge to 'master'.
632
-
633
-
634
-* ab/commit-graph-usage (2021-08-30) 7 commits
635
- (merged to 'next' on 2021-09-03 at 2254ea1e58)
636
- + commit-graph: show "unexpected subcommand" error
637
- + commit-graph: show usage on "commit-graph [write|verify] garbage"
638
- + commit-graph: early exit to "usage" on !argc
639
- + multi-pack-index: refactor "goto usage" pattern
640
- + commit-graph: use parse_options_concat()
641
- + commit-graph: remove redundant handling of -h
642
- + commit-graph: define common usage with a macro
643
-
644
- Fixes on usage message from "git commit-graph".
645
-
646
- Will merge to 'master'.
647
-
648
-
649
-* ab/ls-remote-packet-trace (2021-08-24) 1 commit
650
- (merged to 'next' on 2021-08-30 at fec2e5a7eb)
651
- + ls-remote: set packet_trace_identity(<name>)
652
-
653
- Debugging aid fix.
654
-
655
- Will merge to 'master'.
656
-
657
-
658
-* ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit
659
- (merged to 'next' on 2021-08-30 at 256e1cbc9e)
660
- + rebase: emit one "fatal" in "fatal: fatal: <error>"
661
-
662
- Error message fix.
663
-
664
- Will merge to 'master'.
665
-
666
-
667
-* ab/refs-errno-cleanup (2021-08-25) 4 commits
668
- - refs: make errno output explicit for refs_resolve_ref_unsafe
669
- - refs: explicitly return failure_errno from parse_loose_ref_contents
670
- - branch tests: test for errno propagating on failing read
671
- - refs: add failure_errno to refs_read_raw_ref() signature
672
- (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)
673
-
674
- The "remainder" of hn/refs-errno-cleanup topic.
675
-
676
-
677
-* ab/retire-advice-config (2021-08-25) 4 commits
678
- (merged to 'next' on 2021-09-03 at 0045df3dbb)
679
- + advice: move advice.graftFileDeprecated squashing to commit.[ch]
680
- + advice: remove use of global advice_add_embedded_repo
681
- + advice: remove read uses of most global `advice_` variables
682
- + advice: add enum variants for missing advice variables
683
-
684
- Code clean up to migrate callers from older advice_config[] based
685
- API to newer advice_if_enabled() and advice_enabled() API.
686
-
687
- Will merge to 'master'.
688
-
689
-
690
-* dd/diff-files-unmerged-fix (2021-08-25) 1 commit
691
- (merged to 'next' on 2021-08-30 at 63a1bdddfc)
692
- + diff-lib: ignore paths that are outside $cwd if --relative asked
693
-
694
- "git diff --relative" segfaulted and/or produced incorrect result
695
- when there are unmerged paths.
696
-
697
- Will merge to 'master'.
698
-
699
-
700
-* dd/t6300-wo-gpg-fix (2021-08-25) 2 commits
701
- (merged to 'next' on 2021-08-30 at 59f5669dd6)
702
- + t6300: check for cat-file exit status code
703
- + t6300: don't run cat-file on non-existent object
704
-
705
- Test fix.
706
-
707
- Will merge to 'master'.
708
-
709
-
710
-* ga/send-email-sendmail-cmd (2021-08-24) 1 commit
711
- (merged to 'next' on 2021-08-30 at 1bb659c66c)
712
- + t9001: PATH must not use Windows-style paths
713
-
714
- Test fix.
715
-
716
- Will merge to 'master'.
717
-
718
-
719
-* jb/midx-revindex-fix (2021-08-23) 1 commit
720
- - multi-pack-index: fix *.rev cleanups with --object-dir
721
-
722
- An implementation in "multi-pack-index write" that takes object
723
- directory inconsistently used that and the object store of the
724
- default repository, causing segfaults and possibly corrupting
725
- repositories.
726
-
727
- On hold.
728
- cf. <xmqqo89jbf49.fsf@gitster.g>
729
-
730
-
731
-* jk/t5323-no-pack-test-fix (2021-08-25) 1 commit
732
- (merged to 'next' on 2021-08-30 at 2892635eaf)
733
- + t5323: drop mentions of "master"
734
-
735
- Test fix.
736
-
737
- Will merge to 'master'.
738
-
739
-
740
-* js/maintenance-launchctl-fix (2021-08-24) 2 commits
741
- (merged to 'next' on 2021-08-30 at 12a5da47e7)
742
- + maintenance: skip bootout/bootstrap when plist is registered
743
- + maintenance: create `launchctl` configuration using a lock file
744
-
745
- "git maintenance" scheduler fix for macOS.
746
-
747
- Will merge to 'master'.
748
-
749
-
750
-* jv/pkt-line-batch (2021-09-01) 2 commits
751
- - upload-pack: use stdio in send_ref callbacks
752
- - pkt-line: add stdio packet write functions
753
-
754
- Reduce number of write(2) system calls while sending the
755
- ref advertisement.
756
-
757
- Will merge to 'next'?
758
-
759
-
760
-* me/t5582-cleanup (2021-08-24) 1 commit
761
- (merged to 'next' on 2021-08-30 at e92258e72c)
762
- + t5582: remove spurious 'cd "$D"' line
763
-
764
- Test fix.
765
-
766
- Will merge to 'master'.
767
-
768
-
769
-* mh/credential-leakfix (2021-08-25) 1 commit
770
- (merged to 'next' on 2021-08-30 at be9e67bddc)
771
- + credential: fix leak in credential_apply_config()
772
-
773
- Leak fix.
774
-
775
- Will merge to 'master'.
776
-
777
-
778
-* mt/quiet-with-delayed-checkout (2021-08-26) 1 commit
779
- (merged to 'next' on 2021-08-30 at d243498893)
780
- + checkout: make delayed checkout respect --quiet and --no-progress
781
-
782
- The delayed checkout code path in "git checkout" etc. were chatty
783
- even when --quiet and/or --no-progress options were given.
784
-
785
- Will merge to 'master'.
786
-
787
-
788
-* ps/fetch-omit-formatting-under-quiet (2021-08-30) 1 commit
789
- (merged to 'next' on 2021-09-01 at 2440a8a2aa)
790
- + fetch: skip formatting updated refs with `--quiet`
791
-
792
- "git fetch --quiet" optimization to avoid useless computation of
793
- info that will never be displayed.
794
-
795
- Will merge to 'master'.
796
-
797
-
798
-* ps/ls-refs-strbuf-optim (2021-08-25) 1 commit
799
- (merged to 'next' on 2021-08-30 at e4cbc7243a)
800
- + ls-refs: reuse buffer when sending refs
777
+* kr/doc-webserver-config-for-v2 (2021-09-07) 1 commit
778
+ - Docs: web server must setenv GIT_PROTOCOL for v2
779
802
- Micro-optimization for the wire protocol driver.
780
+ Hints to set GIT_PROTOCOL environment in various CGI environments
781
+ are added to the documentation.
782
804
- Will merge to 'master'.
783
+ Will discard.
784
785
807
-* rs/branch-allow-deleting-dangling (2021-08-27) 1 commit
808
- (merged to 'next' on 2021-08-30 at 35b9d158e8)
809
- + branch: allow deleting dangling branches with --force
786
+* rs/range-diff-avoid-segfault-with-I (2021-09-07) 1 commit
787
+ (merged to 'next' on 2021-09-10 at e8bac5f9ea)
788
+ + range-diff: avoid segfault with -I
789
811
- "git branch -D <branch>" used to refuse to remove a broken branch
812
- ref that points at a missing commit, which has been corrected.
790
+ "git range-diff -I... <range> <range>" segfaulted, which has been
791
+ corrected.
792
793
Will merge to 'master'.
794
795
817
-* rs/git-mmap-uses-malloc (2021-08-24) 1 commit
818
- (merged to 'next' on 2021-08-30 at 6339c8e657)
819
- + compat: let git_mmap use malloc(3) directly
820
-
821
- mmap() imitation used to call xmalloc() that dies upon malloc()
822
- failure, which has been corrected to just return an error to the
823
- caller to be handled.
796
+* so/diff-index-regression-fix (2021-09-07) 1 commit
797
+ (merged to 'next' on 2021-09-08 at ca17912ed3)
798
+ + diff-index: restore -c/--cc options handling
799
+
800
+ Recent "diff -m" changes broke "gitk", which has been corrected.
801
802
Will merge to 'master'.
803
804
828
-* rs/xopen-reports-open-failures (2021-08-25) 2 commits
829
- (merged to 'next' on 2021-08-30 at a8588775c8)
830
- + use xopen() to handle fatal open(2) failures
831
- + xopen: explicitly report creation failures
805
+* tb/pack-finalize-ordering (2021-09-09) 9 commits
806
+ (merged to 'next' on 2021-09-10 at 7b39c39e31)
807
+ + pack-objects: rename .idx files into place after .bitmap files
808
+ + pack-write: split up finish_tmp_packfile() function
809
+ + builtin/index-pack.c: move `.idx` files into place last
810
+ + index-pack: refactor renaming in final()
811
+ + builtin/repack.c: move `.idx` files into place last
812
+ + pack-write.c: rename `.idx` files after `*.rev`
813
+ + pack-write: refactor renaming in finish_tmp_packfile()
814
+ + bulk-checkin.c: store checksum directly
815
+ + pack.h: line-wrap the definition of finish_tmp_packfile()
816
833
- Error diagnostics improvement.
817
+ The order in which various files that make up a single (conceptual)
818
+ packfile has been reevaluated and straightened up. This matters in
819
+ correctness, as an incomplete set of files must not be shown to a
820
+ running Git.
821
822
Will merge to 'master'.
823
824
838
-* sg/column-nl (2021-08-26) 1 commit
839
- (merged to 'next' on 2021-08-30 at a3cb0f4745)
840
- + column: fix parsing of the '--nl' option
825
+* ab/reverse-midx-optim (2021-09-07) 1 commit
826
+ (merged to 'next' on 2021-09-08 at 1972c5931b)
827
+ + pack-write: skip *.rev work when not writing *.rev
828
842
- The parser for the "--nl" option of "git column" has been
843
- corrected.
829
+ The code that optionally creates the *.rev reverse index file has
830
+ been optimized to avoid needless computation when it is not writing
831
+ the file out.
832
833
Will merge to 'master'.
834
835
848
-* ab/unbundle-progress (2021-09-07) 4 commits
849
- - bundle: show progress on "unbundle"
850
- - index-pack: add --progress-title option
851
- - bundle API: change "flags" to be "extra_index_pack_args"
852
- - bundle API: start writing API documentation
836
+* ab/sanitize-leak-ci (2021-09-07) 3 commits
837
+ - tests: add a test mode for SANITIZE=leak, run it in CI
838
+ - CI: refactor "if" to "case" statement
839
+ - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS
840
854
- Add progress display to "git bundle unbundle".
841
+ CI learns to run the leak sanitizer builds.
842
843
Will merge to 'next'?
844
845
859
-* jk/log-warn-on-bogus-encoding (2021-08-27) 2 commits
860
- - docs: use "character encoding" to refer to commit-object encoding
861
- - logmsg_reencode(): warn when iconv() fails
846
+* jc/trivial-threeway-binary-merge (2021-09-05) 1 commit
847
+ (merged to 'next' on 2021-09-08 at d6ba0735d8)
848
+ + apply: resolve trivial merge without hitting ll-merge with "--3way"
849
863
- Doc update plus improved error reporting.
850
+ The "git apply -3" code path learned not to bother the lower level
851
+ merge machinery when the three-way merge can be trivially resolved
852
+ without the content level merge.
853
865
- Will merge to 'next'.
854
+ Will merge to 'master'.
855
856
868
-* rs/archive-use-object-id (2021-08-27) 1 commit
869
- - archive: convert queue_directory to struct object_id
857
+* ms/customizable-ident-expansion (2021-09-01) 1 commit
858
+ - keyword expansion: make "$Id$" string configurable
859
871
- Code cleanup.
860
+ Instead of "$Id$", user-specified string (like $FreeBSD$) can be
861
+ used as an in-blob placeholder for keyword expansion.
862
873
- Will merge to 'next'.
863
864
+* pb/test-use-user-env (2021-09-07) 3 commits
865
+ (merged to 'next' on 2021-09-08 at 6fa5d96723)
866
+ + test-lib-functions: keep user's debugger config files and TERM in 'debug'
867
+ + test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'
868
+ + test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'
869
+
870
+ Teach "test_pause" and "debug" helpers to allow using the HOME and
871
+ TERM environment variables the user usually uses.
872
876
-* rs/show-branch-simplify (2021-08-27) 1 commit
877
- - show-branch: simplify rev_is_head()
873
+ Will merge to 'master'.
874
879
- Code cleanup.
875
881
- Will merge to 'next'.
876
+* js/retire-preserve-merges (2021-09-07) 11 commits
877
+ (merged to 'next' on 2021-09-10 at f645ffd7a3)
878
+ + sequencer: restrict scope of a formerly public function
879
+ + rebase: remove a no-longer-used function
880
+ + rebase: stop mentioning the -p option in comments
881
+ + rebase: remove obsolete code comment
882
+ + rebase: drop the internal `rebase--interactive` command
883
+ + git-svn: drop support for `--preserve-merges`
884
+ + rebase: drop support for `--preserve-merges`
885
+ + pull: remove support for `--rebase=preserve`
886
+ + tests: stop testing `git rebase --preserve-merges`
887
+ + remote: warn about unhandled branch.<name>.rebase values
888
+ + t5520: do not use `pull.rebase=preserve`
889
890
+ The "--preserve-merges" option of "git rebase" has been removed.
891
884
-* lh/systemd-timers (2021-09-07) 3 commits
885
- - maintenance: add support for systemd timers on Linux
886
- - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
887
- - cache.h: Introduce a generic "xdg_config_home_for(…)" function
892
+ Will merge to 'master'.
893
889
- "git maintenance" scheduler learned to use systemd timers as a
890
- possible backend.
894
892
- Will merge to 'next'.
895
+* mr/bisect-in-c-4 (2021-09-02) 6 commits
896
+ - bisect--helper: retire `--bisect-next-check` subcommand
897
+ - bisect--helper: reimplement `bisect_run` shell
898
+ - bisect--helper: reimplement `bisect_visualize()`shell function in C
899
+ - run-command: make `exists_in_PATH()` non-static
900
+ - t6030-bisect-porcelain: add test for bisect visualize
901
+ - t6030-bisect-porcelain: add tests to control bisect run exit cases
902
903
+ Rewrite of "git bisect" in C continues.
904
895
-* ps/fetch-optim (2021-09-01) 7 commits
896
- - fetch: avoid second connectivity check if we already have all objects
897
- - fetch: merge fetching and consuming refs
898
- - fetch: refactor fetch refs to be more extendable
899
- - fetch-pack: optimize loading of refs via commit graph
900
- - connected: refactor iterator to return next object ID directly
901
- - fetch: avoid unpacking headers in object existence check
902
- - fetch: speed up lookup of want refs via commit-graph
905
+ Expecting a reroll.
906
+ cf. <xmqqtuj2h7cp.fsf@gitster.g>
907
904
- Optimize code that handles large number of refs in the "git fetch"
905
- code path.
908
907
- Will merge to 'next'.
909
+* en/remerge-diff (2021-08-31) 7 commits
910
+ - doc/diff-options: explain the new --remerge-diff option
911
+ - show, log: provide a --remerge-diff capability
912
+ - tmp-objdir: new API for creating and removing primary object dirs
913
+ - merge-ort: capture and print ll-merge warnings in our preferred fashion
914
+ - ll-merge: add API for capturing warnings in a strbuf instead of stderr
915
+ - merge-ort: add ability to record conflict messages in a file
916
+ - merge-ort: mark a few more conflict messages as omittable
917
918
+ A new presentation for two-parent merge "--remerge-diff" can be
919
+ used to show the difference between mechanical (and possibly
920
+ conflicted) merge results and the recorded resolution.
921
910
-* ar/submodule-run-update-procedure (2021-08-24) 1 commit
911
- - submodule--helper: run update procedures from C
922
+ What's the status of this one?
923
913
- Reimplementation of parts of "git submodule" in C continues.
924
915
- Will merge to 'next'.
925
+* sg/test-split-index-fix (2021-09-07) 7 commits
926
+ - read-cache: fix GIT_TEST_SPLIT_INDEX
927
+ - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
928
+ - read-cache: look for shared index files next to the index, too
929
+ - t1600-index: disable GIT_TEST_SPLIT_INDEX
930
+ - t1600-index: don't run git commands upstream of a pipe
931
+ - t1600-index: remove unnecessary redirection
932
+ - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
933
+ (this branch uses ds/sparse-index-ignored-files.)
934
935
+ Test updates.
936
918
-* ab/help-autocorrect-prompt (2021-08-14) 1 commit
919
- - help.c: help.autocorrect=prompt waits for user action
937
921
- The logic for auto-correction of misspelt subcommands learned to go
922
- interactive when the help.autocorrect configuration variable is set
923
- to true.
938
+* ab/refs-errno-cleanup (2021-08-25) 4 commits
939
+ - refs: make errno output explicit for refs_resolve_ref_unsafe
940
+ - refs: explicitly return failure_errno from parse_loose_ref_contents
941
+ - branch tests: test for errno propagating on failing read
942
+ - refs: add failure_errno to refs_read_raw_ref() signature
943
+ (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)
944
925
- Will merge to 'next'.
945
+ The "remainder" of hn/refs-errno-cleanup topic.
946
947
928
-* zh/cherry-pick-advice (2021-08-23) 1 commit
929
- (merged to 'next' on 2021-09-01 at 6ff491cc09)
930
- + cherry-pick: use better advice message
948
+* jv/pkt-line-batch (2021-09-01) 2 commits
949
+ (merged to 'next' on 2021-09-10 at c31d871c9a)
950
+ + upload-pack: use stdio in send_ref callbacks
951
+ + pkt-line: add stdio packet write functions
952
932
- The advice message that "git cherry-pick" gives when it asks
933
- conflicted replay of a commit to be resolved by the end user has
934
- been updated.
953
+ Reduce number of write(2) system calls while sending the
954
+ ref advertisement.
955
956
Will merge to 'master'.
957
958
939
-* mk/clone-recurse-submodules (2021-08-30) 1 commit
940
- (merged to 'next' on 2021-09-03 at 9787178599)
941
- + clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
959
+* ab/unbundle-progress (2021-09-07) 4 commits
960
+ - bundle: show progress on "unbundle"
961
+ - index-pack: add --progress-title option
962
+ - bundle API: change "flags" to be "extra_index_pack_args"
963
+ - bundle API: start writing API documentation
964
943
- After "git clone --recurse-submodules", all submodules are cloned
944
- but they are not by default recursed into by other commands. With
945
- submodule.stickyRecursiveClone configuration set, submodule.recurse
946
- configuration is set to true in a repository created by "clone"
947
- with "--recurse-submodules" option.
965
+ Add progress display to "git bundle unbundle".
966
+
967
+ Will merge to 'next'.
968
+
969
+
970
+* lh/systemd-timers (2021-09-07) 3 commits
971
+ (merged to 'next' on 2021-09-10 at b27d72031a)
972
+ + maintenance: add support for systemd timers on Linux
973
+ + maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
974
+ + cache.h: Introduce a generic "xdg_config_home_for(…)" function
975
+
976
+ "git maintenance" scheduler learned to use systemd timers as a
977
+ possible backend.
978
979
Will merge to 'master'.
980
981
952
-* ka/want-ref-in-namespace (2021-09-01) 3 commits
953
- (merged to 'next' on 2021-09-01 at a1075a92a9)
954
- + docs: clarify the interaction of transfer.hideRefs and namespaces
955
- + upload-pack.c: treat want-ref relative to namespace
956
- + t5730: introduce fetch command helper
982
+* ps/fetch-optim (2021-09-01) 7 commits
983
+ (merged to 'next' on 2021-09-08 at 99f865125d)
984
+ + fetch: avoid second connectivity check if we already have all objects
985
+ + fetch: merge fetching and consuming refs
986
+ + fetch: refactor fetch refs to be more extendable
987
+ + fetch-pack: optimize loading of refs via commit graph
988
+ + connected: refactor iterator to return next object ID directly
989
+ + fetch: avoid unpacking headers in object existence check
990
+ + fetch: speed up lookup of want refs via commit-graph
991
958
- "git upload-pack" which runs on the other side of "git fetch"
959
- forgot to take the ref namespaces into account when handling
960
- want-ref requests.
992
+ Optimize code that handles large number of refs in the "git fetch"
993
+ code path.
994
995
Will merge to 'master'.
996
997
965
-* cb/ci-build-pedantic (2021-08-11) 1 commit
966
- - ci: run a pedantic build as part of the GitHub workflow
998
+* ar/submodule-run-update-procedure (2021-08-24) 1 commit
999
+ - submodule--helper: run update procedures from C
1000
968
- CI update.
1001
+ Reimplementation of parts of "git submodule" in C continues.
1002
1003
Will merge to 'next'.
1004
@@ -981,44 +1014,33 @@ Release tarballs are available at:
1014
- sparse-index: silently return when not using cone-mode patterns
1015
- t7519: rewrite sparse index test
1016
- Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
984
- (this branch is used by sg/test-split-index-fix.)
1017
+ (this branch is used by ds/mergies-with-sparse-index and sg/test-split-index-fix.)
1018
1019
In cone mode, the sparse-index codepath learned to remove ignored
1020
files (like build artifacts) outside the sparse cone, allowing the
1021
entire directory outside the sparse cone to be removed, which is
1022
especially useful when the sparse patterns change.
1023
991
- Will merge to 'next'?
992
-
993
-
994
-* js/advise-when-skipping-cherry-picked (2021-08-30) 1 commit
995
- (merged to 'next' on 2021-09-01 at bc883fce56)
996
- + sequencer: advise if skipping cherry-picked commit
997
-
998
- "git rebase" by default skips changes that are equivalent to
999
- commits that are already in the history the branch is rebased onto;
1000
- give messages when this happens to let the users be aware of
1001
- skipped commits, and also teach them how to tell "rebase" to keep
1002
- duplicated changes.
1003
-
1004
- Will merge to 'master'.
1024
+ Will merge to 'next'.
1025
1026
1007
-* jt/grep-wo-submodule-odb-as-alternate (2021-09-07) 8 commits
1008
- - t7814: show lack of alternate ODB-adding
1009
- - submodule-config: pass repo upon blob config read
1010
- - grep: add repository to OID grep sources
1011
- - grep: allocate subrepos on heap
1012
- - grep: read submodule entry with explicit repo
1013
- - grep: typesafe versions of grep_source_init
1014
- - grep: use submodule-ODB-as-alternate lazy-addition
1015
- - submodule: lazily add submodule ODBs as alternates
1027
+* jt/grep-wo-submodule-odb-as-alternate (2021-09-08) 8 commits
1028
+ (merged to 'next' on 2021-09-08 at 67612d0b7f)
1029
+ + t7814: show lack of alternate ODB-adding
1030
+ + submodule-config: pass repo upon blob config read
1031
+ + grep: add repository to OID grep sources
1032
+ + grep: allocate subrepos on heap
1033
+ + grep: read submodule entry with explicit repo
1034
+ + grep: typesafe versions of grep_source_init
1035
+ + grep: use submodule-ODB-as-alternate lazy-addition
1036
+ + submodule: lazily add submodule ODBs as alternates
1037
+ (this branch is used by jt/add-submodule-odb-clean-up.)
1038
1039
The code to make "git grep" recurse into submodules has been
1040
updated to migrate away from the "add submodule's object store as
1041
an alternate object store" mechanism (which is suboptimal).
1042
1021
- Will merge to 'next'.
1043
+ Will merge to 'master'.
1044
1045
1046
* ar/submodule-add-more (2021-08-10) 10 commits
@@ -1034,22 +1056,11 @@ Release tarballs are available at:
1056
- Merge branch 'ar/submodule-add-config' into ar/submodule-add
1057
(this branch uses ar/submodule-add-config.)
1058
1037
- More parts of "git submoudle add" has been rewritten in C.
1059
+ More parts of "git submodule add" has been rewritten in C.
1060
1061
Will merge to 'next'.
1062
1063
1042
-* cb/makefile-apple-clang (2021-08-06) 3 commits
1043
- (merged to 'next' on 2021-08-30 at 9fe8f1a9b3)
1044
- + build: catch clang that identifies itself as "$VENDOR clang"
1045
- + build: clang version may not be followed by extra words
1046
- + build: update detect-compiler for newer Xcode version
1047
-
1048
- Build update for Apple clang.
1049
-
1050
- Will merge to 'master'.
1051
-
1052
-
1064
* ab/lib-subtest (2021-08-05) 11 commits
1065
- test-lib tests: assert 1 exit code, not non-zero
1066
- test-lib tests: refactor common part of check_sub_test_lib_test*()
@@ -1082,14 +1093,15 @@ Release tarballs are available at:
1093
cf. <20210901050406.GB76263@szeder.dev>
1094
1095
1085
-* ab/progress-users-adjust-counters (2021-08-25) 2 commits
1086
- - entry: show finer-grained counter in "Filtering content" progress line
1087
- - commit-graph: fix bogus counter in "Scanning merged commits" progress line
1096
+* ab/progress-users-adjust-counters (2021-09-09) 2 commits
1097
+ (merged to 'next' on 2021-09-10 at b50c37aa44)
1098
+ + entry: show finer-grained counter in "Filtering content" progress line
1099
+ + commit-graph: fix bogus counter in "Scanning merged commits" progress line
1100
1101
The code to show progress indicator in a few codepaths did not
1102
cover between 0-100%, which has been corrected.
1103
1092
- Will merge to 'next'?
1104
+ Will merge to 'master'.
1105
1106
1107
* ar/submodule-add-config (2021-08-10) 1 commit
@@ -1102,34 +1114,34 @@ Release tarballs are available at:
1114
1115
1116
* dt/submodule-diff-fixes (2021-08-31) 3 commits
1105
- - diff --submodule=diff: don't print failure message twice
1106
- - diff --submodule=diff: do not fail on ever-initialied deleted submodules
1107
- - t4060: remove unused variable
1117
+ (merged to 'next' on 2021-09-10 at 21b773f4fe)
1118
+ + diff --submodule=diff: don't print failure message twice
1119
+ + diff --submodule=diff: do not fail on ever-initialied deleted submodules
1120
+ + t4060: remove unused variable
1121
1122
"git diff --submodule=diff" showed failure from run_command() when
1123
trying to run diff inside a submodule, when the user manually
1124
removes the submodule directory.
1125
1113
- Will merge to 'next'?
1114
- cf. <20210812001332.715876-1-dturner@twosigma.com>
1126
+ Will merge to 'master'.
1127
1128
1117
-* fs/ssh-signing (2021-08-29) 9 commits
1118
- (merged to 'next' on 2021-09-03 at eed4e814c0)
1119
- + ssh signing: test that gpg fails for unknown keys
1120
- + ssh signing: tests for logs, tags & push certs
1121
- + ssh signing: duplicate t7510 tests for commits
1122
- + ssh signing: verify signatures using ssh-keygen
1123
- + ssh signing: provide a textual signing_key_id
1124
- + ssh signing: retrieve a default key from ssh-agent
1125
- + ssh signing: add ssh key format and signing code
1126
- + ssh signing: add test prereqs
1127
- + ssh signing: preliminary refactoring and clean-up
1129
+* fs/ssh-signing (2021-09-10) 9 commits
1130
+ - ssh signing: test that gpg fails for unknown keys
1131
+ - ssh signing: tests for logs, tags & push certs
1132
+ - ssh signing: duplicate t7510 tests for commits
1133
+ - ssh signing: verify signatures using ssh-keygen
1134
+ - ssh signing: provide a textual signing_key_id
1135
+ - ssh signing: retrieve a default key from ssh-agent
1136
+ - ssh signing: add ssh key format and signing code
1137
+ - ssh signing: add test prereqs
1138
+ - ssh signing: preliminary refactoring and clean-up
1139
1140
Use ssh public crypto for object and push-cert signing.
1141
1142
On hold.
1132
- cf. <xmqq4kawcmqg.fsf@gitster.g>
1143
+ cf. <pull.1041.v8.git.git.1631304462.gitgitgadget@gmail.com>
1144
+ cf. <532d97e7-8c91-df6a-6d90-70668256f513@gigacodes.de>
1145
1146
1147
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
@@ -1151,46 +1163,50 @@ Release tarballs are available at:
1163
1164
Build clean-up for "make tags" and friends.
1165
1154
- Will merge to 'next'?
1166
+ Will merge to 'next'.
1167
1168
1157
-* tb/multi-pack-bitmaps (2021-09-01) 27 commits
1158
- - p5326: perf tests for MIDX bitmaps
1159
- - p5310: extract full and partial bitmap tests
1160
- - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
1161
- - t7700: update to work with MIDX bitmap test knob
1162
- - t5319: don't write MIDX bitmaps in t5319
1163
- - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
1164
- - t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
1165
- - t5326: test multi-pack bitmap behavior
1166
- - t/helper/test-read-midx.c: add --checksum mode
1167
- - t5310: move some tests to lib-bitmap.sh
1168
- - pack-bitmap: write multi-pack bitmaps
1169
- - pack-bitmap: read multi-pack bitmaps
1170
- - pack-bitmap.c: avoid redundant calls to try_partial_reuse
1171
- - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
1172
- - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
1173
- - pack-bitmap.c: introduce 'bitmap_num_objects()'
1174
- - midx: avoid opening multiple MIDXs when writing
1175
- - midx: close linked MIDXs, avoid leaking memory
1176
- - midx: infer preferred pack when not given one
1177
- - midx: reject empty `--preferred-pack`'s
1178
- - midx: clear auxiliary .rev after replacing the MIDX
1179
- - midx: fix `*.rev` cleanups with `--object-dir`
1180
- - midx: disallow running outside of a repository
1181
- - Documentation: describe MIDX-based bitmaps
1182
- - pack-bitmap-write.c: free existing bitmaps
1183
- - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
1184
- - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
1169
+* tb/multi-pack-bitmaps (2021-09-09) 29 commits
1170
+ (merged to 'next' on 2021-09-10 at 71559ef435)
1171
+ + pack-bitmap: drop bitmap_index argument from try_partial_reuse()
1172
+ + pack-bitmap: drop repository argument from prepare_midx_bitmap_git()
1173
+ (merged to 'next' on 2021-09-08 at f2b7415bd8)
1174
+ + p5326: perf tests for MIDX bitmaps
1175
+ + p5310: extract full and partial bitmap tests
1176
+ + midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
1177
+ + t7700: update to work with MIDX bitmap test knob
1178
+ + t5319: don't write MIDX bitmaps in t5319
1179
+ + t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
1180
+ + t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
1181
+ + t5326: test multi-pack bitmap behavior
1182
+ + t/helper/test-read-midx.c: add --checksum mode
1183
+ + t5310: move some tests to lib-bitmap.sh
1184
+ + pack-bitmap: write multi-pack bitmaps
1185
+ + pack-bitmap: read multi-pack bitmaps
1186
+ + pack-bitmap.c: avoid redundant calls to try_partial_reuse
1187
+ + pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
1188
+ + pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
1189
+ + pack-bitmap.c: introduce 'bitmap_num_objects()'
1190
+ + midx: avoid opening multiple MIDXs when writing
1191
+ + midx: close linked MIDXs, avoid leaking memory
1192
+ + midx: infer preferred pack when not given one
1193
+ + midx: reject empty `--preferred-pack`'s
1194
+ + midx: clear auxiliary .rev after replacing the MIDX
1195
+ + midx: fix `*.rev` cleanups with `--object-dir`
1196
+ + midx: disallow running outside of a repository
1197
+ + Documentation: describe MIDX-based bitmaps
1198
+ + pack-bitmap-write.c: free existing bitmaps
1199
+ + pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
1200
+ + pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
1201
1202
The reachability bitmap file used to be generated only for a single
1203
pack, but now we've learned to generate bitmaps for history that
1204
span across multiple packfiles.
1205
1190
- Will merge to 'next'.
1206
+ Will merge to 'master'.
1207
1208
1193
-* ab/config-based-hooks-base (2021-08-03) 36 commits
1209
+* ab/config-based-hooks-base (2021-09-09) 36 commits
1210
- hooks: fix a TOCTOU in "did we run a hook?" heuristic
1211
- receive-pack: convert receive hooks to hook.h
1212
- post-update: use hook.h library
@@ -1221,9 +1237,9 @@ Release tarballs are available at:
1237
- gc: use hook library for pre-auto-gc hook
1238
- hook: add 'run' subcommand
1239
- hook-list.h: add a generated list of hooks, like config-list.h
1224
- - hook.c users: use "hook_exists()" insted of "find_hook()"
1240
+ - hook.c users: use "hook_exists()" instead of "find_hook()"
1241
- hook.c: add a hook_exists() wrapper and use it in bugreport.c
1226
- - hook.[ch]: move find_hook() to this new library
1242
+ - hook.[ch]: move find_hook() from run-command.c to hook.c
1243
- Makefile: remove an out-of-date comment
1244
- Makefile: stop hardcoding {command,config}-list.h
1245
- Makefile: mark "check" target as .PHONY
@@ -1250,31 +1266,7 @@ Release tarballs are available at:
1266
1267
Code clean-up around "git serve".
1268
1253
- Will merge to 'next'?
1254
-
1255
-
1256
-* ab/test-tool-cache-cleanup (2021-08-24) 4 commits
1257
- - read-cache perf: add a perf test for refresh_index()
1258
- - test-tool: migrate read-cache-again to parse_options()
1259
- - test-tool: migrate read-cache-perf to parse_options()
1260
- - test-tool: split up test-tool read-cache
1261
-
1262
- Test code shuffling.
1263
-
1264
- Will discard.
1265
- cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
1266
-
1267
-
1268
-* ab/pack-objects-stdin (2021-07-09) 5 commits
1269
- - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
1270
- - pack-objects.c: do stdin parsing via revision.c's API
1271
- - revision.[ch]: add a "handle_stdin_line" API
1272
- - revision.h: refactor "disable_stdin" and "read_from_stdin"
1273
- - upload-pack: run is_repository_shallow() before setup_revisions()
1274
-
1275
- Introduce handle_stdin_line callback to revision API and uses it.
1276
-
1277
- Waiting for reviews.
1269
+ Will merge to 'next'.
1270
1271
1272
* pw/diff-color-moved-fix (2021-08-05) 13 commits
@@ -1297,11 +1289,12 @@ Release tarballs are available at:
1289
Long-overdue correctness and performance update to "diff
1290
--color-moved" feature.
1291
1300
- Eject for reroll.
1292
+ Expecting a reroll.
1293
cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
1294
1295
1304
-* hn/reftable (2021-09-07) 19 commits
1296
+* hn/reftable (2021-09-10) 20 commits
1297
+ - fixup! reftable: implement stack, a mutable database of reftable files.
1298
- Add "test-tool dump-reftable" command.
1299
- reftable: add dump utility
1300
- reftable: implement stack, a mutable database of reftable files.
@@ -1358,36 +1351,6 @@ Release tarballs are available at:
1351
--------------------------------------------------
1352
[Discarded]
1353
1361
-* zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
1362
- . cherry-pick: use better advice message
1363
- . cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
1364
-
1365
- Originally merged to 'next' on 2021-08-04
1366
-
1367
- "git cherry-pick" loses its state file when a stray
1368
- GIT_CHERRY_PICK_HELP environment is present, which has been
1369
- corrected.
1370
-
1371
- Reverted out of 'next' at 1f62d2e1 on 2021-08-11
1372
-
1373
-
1374
-* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit
1375
- . refs: drop unused "flags" parameter to lock_ref_oid_basic()
1376
-
1377
- Code cleanup.
1378
-
1379
- Obsoleted by updated ab/refs-files-cleanup
1380
-
1381
-
1382
-* ow/clone-bare-origin (2021-08-03) 1 commit
1383
- - clone: Allow combining --bare and --origin
1384
-
1385
- "git clone" did not like to take "--bare" and "--origin=X" at the
1386
- same time; loosen the restriction.
1387
-
1388
- cf. <20210802174944.53745-1-oystwa@gmail.com>
1389
-
1390
-
1354
* np/blame-ignore-revs-file-may-be-optional (2021-08-09) 1 commit
1355
- blame: add config `blame.ignoreRevsFileIsOptional`
1356
@@ -1403,3 +1366,23 @@ Release tarballs are available at:
1366
can be used for not just blame.ignoreRevsFile but other filenames.
1367
1368
Queued just as a reminder of the theme.
1369
+
1370
+
1371
+* ab/test-tool-cache-cleanup (2021-08-24) 4 commits
1372
+ - read-cache perf: add a perf test for refresh_index()
1373
+ - test-tool: migrate read-cache-again to parse_options()
1374
+ - test-tool: migrate read-cache-perf to parse_options()
1375
+ - test-tool: split up test-tool read-cache
1376
+
1377
+ Test code shuffling.
1378
+
1379
+ Discarded.
1380
+ cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
1381
+
1382
+ * ow/clone-bare-origin (2021-08-03) 1 commit
1383
+ - clone: Allow combining --bare and --origin
1384
+
1385
+ "git clone" did not like to take "--bare" and "--origin=X" at the
1386
+ same time; loosen the restriction.
1387
+
1388
+ cf. <20210802174944.53745-1-oystwa@gmail.com>