What's cooking (2019/11 #04)
Junio C Hamano committed
Nov 25, 2019 at 16:05 UTC
5fcc705f3144f074674144ca5b7169bdc5f6b422
1 file changed
+358
-281
whats-cooking.txt
+358
-281
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2019, #03; Tue, 19)
3
+Subject: What's cooking in git.git (Nov 2019, #04; Mon, 25)
4
X-master-at: d9f6f3b6195a0ca35642561e530798ad1469bd41
5
-X-next-at: 69ef04c0130f4b0b2f74006aac01f51233c7f246
5
+X-next-at: 34dc348eaf04483f062911e310f14c9f4e8ddf1e
6
7
-What's cooking in git.git (Nov 2019, #03; Tue, 19)
7
+What's cooking in git.git (Nov 2019, #04; Mon, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-A bunch of topics, mostly the ones that were in 'next' before the
16
-latest release, have been merged to 'master'. Also, quite a lot of
17
-topics now have started cooking in 'next'. It will hopefully become
18
-a short and productive cycle ;-)
15
+Quite a many topics are now marked to be merged to 'master', which
16
+may happen sometime next week (I'll be mostly offline this week).
17
+Please stop me if I mistakenly marked some that are not quite ready.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -23,185 +22,361 @@ of the repositories listed at
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
--------------------------------------------------
26
-[Graduated to "master"]
25
+[New Topics]
26
28
-* bc/hash-independent-tests-part-6 (2019-10-28) 15 commits
29
- (merged to 'next' on 2019-10-30 at 70037a3839)
30
- + t4048: abstract away SHA-1-specific constants
31
- + t4045: make hash-size independent
32
- + t4044: update test to work with SHA-256
33
- + t4039: abstract away SHA-1-specific constants
34
- + t4038: abstract away SHA-1 specific constants
35
- + t4034: abstract away SHA-1-specific constants
36
- + t4027: make hash-size independent
37
- + t4015: abstract away SHA-1-specific constants
38
- + t4011: abstract away SHA-1-specific constants
39
- + t4010: abstract away SHA-1-specific constants
40
- + t3429: remove SHA1 annotation
41
- + t1305: avoid comparing extensions
42
- + rev-parse: add a --show-object-format option
43
- + t/oid-info: add empty tree and empty blob values
44
- + t/oid-info: allow looking up hash algorithm name
27
+* ds/commit-graph-delay-gen-progress (2019-11-22) 2 commits
28
+ - commit-graph: use start_delayed_progress()
29
+ - progress: create GIT_PROGRESS_DELAY
30
46
- Test updates to prepare for SHA-2 transition continues.
31
+ One kind of progress messages were always given during commit-graph
32
+ generation, instead of following the "if it takes more than two
33
+ seconds, show progress" pattern, which has been corrected.
34
35
49
-* dd/notes-copy-default-dst-to-head (2019-10-18) 2 commits
50
- (merged to 'next' on 2019-10-18 at 2588a175ec)
51
- + notes: fix minimum number of parameters to "copy" subcommand
52
- + t3301: test diagnose messages for too few/many paramters
36
+* ds/sparse-cone (2019-11-22) 19 commits
37
+ - sparse-checkout: check for dirty status
38
+ - sparse-checkout: update working directory in-process for 'init'
39
+ - sparse-checkout: cone mode should not interact with .gitignore
40
+ - sparse-checkout: write using lockfile
41
+ - sparse-checkout: use in-process update for disable subcommand
42
+ - sparse-checkout: update working directory in-process
43
+ - sparse-checkout: sanitize for nested folders
44
+ - unpack-trees: add progress to clear_ce_flags()
45
+ - unpack-trees: hash less in cone mode
46
+ - sparse-checkout: init and set in cone mode
47
+ - sparse-checkout: use hashmaps for cone patterns
48
+ - sparse-checkout: add 'cone' mode
49
+ - trace2: add region in clear_ce_flags
50
+ - sparse-checkout: create 'disable' subcommand
51
+ - sparse-checkout: add '--stdin' option to set subcommand
52
+ - sparse-checkout: 'set' subcommand
53
+ - clone: add --sparse mode
54
+ - sparse-checkout: create 'init' subcommand
55
+ - sparse-checkout: create builtin with 'list' subcommand
56
54
- "git notes copy $original" ought to copy the notes attached to the
55
- original object to HEAD, but a mistaken tightening to command line
56
- parameter validation made earlier disabled that feature by mistake.
57
+ Management of sparsely checked-out working tree has gained a
58
+ dedicated "sparse-checkout" command.
59
60
59
-* dl/apply-3way-diff3 (2019-10-24) 5 commits
60
- (merged to 'next' on 2019-10-24 at 84e27d28b6)
61
- + apply: respect merge.conflictStyle in --3way
62
- + t4108: demonstrate bug in apply
63
- + t4108: use `test_config` instead of `git config`
64
- + t4108: remove git command upstream of pipe
65
- + t4108: replace create_file with test_write_lines
61
+* dl/range-diff-with-notes (2019-11-21) 10 commits
62
+ (merged to 'next' on 2019-11-25 at dd6dad97c1)
63
+ + format-patch: pass notes configuration to range-diff
64
+ + range-diff: pass through --notes to `git log`
65
+ + range-diff: output `## Notes ##` header
66
+ + t3206: range-diff compares logs with commit notes
67
+ + t3206: s/expected/expect/
68
+ + t3206: disable parameter substitution in heredoc
69
+ + t3206: remove spaces after redirect operators
70
+ + pretty-options.txt: --notes accepts a ref instead of treeish
71
+ + rev-list-options.txt: remove reference to --show-notes
72
+ + argv-array: add space after `while`
73
67
- "git apply --3way" learned to honor merge.conflictStyle
68
- configuration variable, like merges would.
74
+ "git range-diff" learned to take the "--notes=<ref>" and the
75
+ "--no-notes" options to control the commit notes included in the
76
+ log message that gets compared.
77
78
+ Will merge to 'master'.
79
71
-* dl/format-patch-cover-from-desc (2019-10-16) 3 commits
72
- (merged to 'next' on 2019-10-18 at 40e992b6f5)
73
- + format-patch: teach --cover-from-description option
74
- + format-patch: use enum variables
75
- + format-patch: replace erroneous and condition
80
77
- The branch description ("git branch --edit-description") has been
78
- used to fill the body of the cover letters by the format-patch
79
- command; this has been enhanced so that the subject can also be
80
- filled.
81
+* jc/azure-ci-osx-fix-fix (2019-11-20) 1 commit
82
+ (merged to 'next' on 2019-11-25 at 7de6356e67)
83
+ + ci(osx): update homebrew-cask repository with less noise
84
85
+ CI jobs for macOS has been made less chatty when updating perforce
86
+ package used during testing.
87
83
-* en/merge-recursive-directory-rename-fixes (2019-10-23) 3 commits
84
- (merged to 'next' on 2019-10-24 at 82e64029a8)
85
- + t604[236]: do not run setup in separate tests
86
- + merge-recursive: fix merging a subdirectory into the root directory
87
- + merge-recursive: clean up get_renamed_dir_portion()
88
+ Will merge to 'master'.
89
89
- When all files from some subdirectory were renamed to the root
90
- directory, the directory rename heuristics would fail to detect that
91
- as a rename/merge of the subdirectory to the root directory, which has
92
- been corrected.
90
91
+* jk/fail-show-toplevel-outside-working-tree (2019-11-20) 1 commit
92
+ (merged to 'next' on 2019-11-25 at cd97ae38bc)
93
+ + rev-parse: make --show-toplevel without a worktree an error
94
95
-* es/walken-tutorial (2019-10-12) 1 commit
96
- (merged to 'next' on 2019-10-18 at 59160e59e9)
97
- + documentation: add tutorial for object walking
95
+ "git rev-parse --show-toplevel" run outside of any working tree did
96
+ not error out, which has been corrected.
97
99
- A tutorial on object enumeration.
98
+ Will merge to 'master'.
99
100
102
-* hv/bitshift-constants-in-blame (2019-10-21) 1 commit
103
- (merged to 'next' on 2019-10-24 at bc84aae4d4)
104
- + builtin/blame.c: constants into bit shift format
101
+* pb/submodule-update-fetches (2019-11-24) 1 commit
102
+ (merged to 'next' on 2019-11-25 at 7736f98351)
103
+ + doc: mention that 'git submodule update' fetches missing commits
104
106
- Move the definition of a set of bitmask constants from 0ctal
107
- literal to (1U<<count) notation.
105
+ Doc update.
106
107
+ Will merge to 'master'.
108
110
-* hw/remove-api-docs-placeholder (2019-10-25) 1 commit
111
- (merged to 'next' on 2019-10-30 at c99fe16682)
112
- + documentation: remove empty doc files
109
114
- Docfix.
110
+* sg/unpack-progress-throughput (2019-11-20) 1 commit
111
+ (merged to 'next' on 2019-11-25 at 0418db6a27)
112
+ + builtin/unpack-objects.c: show throughput progress
113
114
+ "git unpack-objects" used to show progress based only on the number
115
+ of received and unpacked objects, which stalled when it has to
116
+ handle an unusually large object. It now shows the throughput as
117
+ well.
118
117
-* jc/am-show-current-patch-docfix (2019-10-23) 1 commit
118
- (merged to 'next' on 2019-10-24 at 31fa6081f2)
119
- + doc: am --show-current-patch gives an entire e-mail message
119
+ Will merge to 'master'.
120
121
- Doc update.
121
+
122
+* dl/test-cleanup (2019-11-23) 22 commits
123
+ - t7700: stop losing return codes of git commands
124
+ - t7700: s/test -f/test_path_is_file/
125
+ - t7700: move keywords onto their own line
126
+ - t7700: remove spaces after redirect operators
127
+ - t7700: drop redirections to /dev/null
128
+ - t7501: stop losing return codes of git commands
129
+ - t7501: remove spaces after redirect operators
130
+ - t5703: stop losing return codes of git commands
131
+ - t5703: simplify one-time-sed generation logic
132
+ - t5317: use ! grep to check for no matching lines
133
+ - t5317: stop losing return codes of git commands
134
+ - t4138: stop losing return codes of git commands
135
+ - t4015: use test_write_lines()
136
+ - t4015: stop losing return codes of git commands
137
+ - t3600: comment on inducing SIGPIPE in `git rm`
138
+ - t3600: stop losing return codes of git commands
139
+ - t3600: use test_line_count() where possible
140
+ - t3301: stop losing return codes of git commands
141
+ - t0090: stop losing return codes of git commands
142
+ - t0014: remove git command upstream of pipe
143
+ - apply-one-time-sed.sh: modernize style
144
+ - lib-bash.sh: move `then` onto its own line
145
+
146
+ Test cleanup.
147
+
148
+ Will merge to 'next'.
149
+
150
+
151
+* tg/perf-remove-stale-result (2019-11-21) 1 commit
152
+ - perf-lib: remove old result files before running tests
153
+
154
+ PerfTest cleanup.
155
+
156
+ Expecting a reroll.
157
+ cf. <20191122081108.GA38815@cat>
158
+
159
+
160
+* us/unpack-trees-fsmonitor (2019-11-21) 1 commit
161
+ - unpack-trees: skip stat on fsmonitor-valid files
162
+ (this branch uses jc/fsmonitor-sanity-fix.)
163
+
164
+ Users of oneway_merge() (like "reset --hard") learned to take
165
+ advantage of fsmonitor to avoid unnecessary lstat(2) calls.
166
+
167
+ Will merge to 'next'.
168
+
169
+
170
+* ds/fsmonitor-testing (2019-11-22) 11 commits
171
+ - test-lib: clear watchman watches at test completion
172
+ - t7519: disable external GIT_TEST_FSMONITOR variable
173
+ - t7063: disable fsmonitor with status cache
174
+ - tests: disable fsmonitor in submodule tests
175
+ - t3600-rm.sh: disable fsmonitor when deleting populated submodule
176
+ - t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE
177
+ - fsmonitor: disable fsmonitor with worktrees
178
+ - t1510-repo-setup.sh: disable fsmonitor if no .git dir
179
+ - t1301-shared-repo.sh: disable FSMONITOR
180
+ - fsmonitor: do not output to stderr for tests
181
+ - fsmonitor: disable in a bare repo
182
+
183
+ Updates around testing fsmoitor integration.
184
+
185
+ Will merge to 'next'.
186
+
187
+
188
+* hi/gpg-optional-pkfp-fix (2019-11-23) 2 commits
189
+ (merged to 'next' on 2019-11-25 at b0d668176f)
190
+ + gpg-interface: limit search for primary key fingerprint
191
+ + gpg-interface: refactor the free-and-xmemdupz pattern
192
+
193
+ The code to parse GPG output used to assume incorrectly that the
194
+ finterprint for the primary key would always be present for a valid
195
+ signature, which has been corrected.
196
+
197
+ Will merge to 'master'.
198
+
199
+
200
+* hv/assume-priumax-is-available-anywhere (2019-11-25) 1 commit
201
+ - git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
202
+
203
+ We have had compatibility fallback macro definitions for "PRIuMAX",
204
+ "PRIu32", etc. but did not for "PRIdMAX", while the code used the
205
+ last one apparently without any hiccup reported recently. The
206
+ fallback macro definitions for these <inttypes.h> macros that must
207
+ appear in C99 systems have been removed.
208
+
209
+ Will merge to 'next'.
210
+
211
+
212
+* js/git-svn-use-rebase-merges (2019-11-23) 1 commit
213
+ (merged to 'next' on 2019-11-25 at 9585fe30f8)
214
+ + git svn: stop using `rebase --preserve-merges`
215
+
216
+ Prepare further for "rebase --preserve-merges" deprecation.
217
+
218
+ Will merge to 'master'.
219
+
220
+
221
+* js/mingw-inherit-only-std-handles (2019-11-23) 4 commits
222
+ - mingw: restrict file handle inheritance only on Windows 7 and later
223
+ - mingw: spawned processes need to inherit only standard handles
224
+ - mingw: work around incorrect standard handles
225
+ - mingw: demonstrate that all file handles are inherited by child processes
226
+
227
+ Work around a issue where a FD that is left open when spawning a
228
+ child process and is kept open in the child can interfere with the
229
+ operation in the parent process on Windows.
230
+
231
+ Will merge to 'next'.
232
+
233
+
234
+* mg/doc-submodule-status-cached (2019-11-24) 1 commit
235
+ (merged to 'next' on 2019-11-25 at fa833392a3)
236
+ + doc: document 'git submodule status --cached'
237
+
238
+ "git submodule status" and "git submodule status --cached" show
239
+ different things, but the documentation did not cover them
240
+ correctly, which has been corrected.
241
+
242
+ Will merge to 'master'.
243
244
124
-* js/rebase-deprecate-preserve-merges (2019-10-21) 1 commit
125
- (merged to 'next' on 2019-10-24 at 82fa49bbf2)
126
- + rebase: hide --preserve-merges option
245
+* mg/submodule-status-from-a-subdirectory (2019-11-25) 1 commit
246
+ - submodule: fix 'submodule status' when called from a subdirectory
247
128
- "git rebase --preserve-merges" has been marked as deprecated; this
129
- release stops advertising it in the "git rebase -h" output.
248
+ "git submodule status" that is run from a subdirectory of the
249
+ superproject did not work well, which has been corrected.
250
251
+ Will merge to 'next'.
252
132
-* js/update-index-ignore-removal-for-skip-worktree (2019-11-02) 2 commits
133
- (merged to 'next' on 2019-11-02 at 57f7fb885f)
134
- + stash: handle staged changes in skip-worktree files correctly
135
- + update-index: optionally leave skip-worktree entries alone
253
137
- "git stash save" in a working tree that is sparsely checked out
138
- mistakenly removed paths that are outside the area of interest.
254
+* mh/clear-topo-walk-upon-reset (2019-11-25) 2 commits
255
+ - revision: free topo_walk_info before creating a new one in init_topo_walk
256
+ - revision: clear the topo-walk flags in reset_revision_walk
257
258
+ The revision walking machinery uses resources like per-object flag
259
+ bits that need to be reset before a new iteration of walking
260
+ begins, but the resources related to topological walk were not
261
+ cleared correctly, which has been corrected.
262
141
-* jt/fetch-pack-record-refs-in-the-dot-promisor (2019-10-16) 1 commit
142
- (merged to 'next' on 2019-10-18 at 4ead52e59a)
143
- + fetch-pack: write fetched refs to .promisor
263
+ Will merge to 'next'.
264
145
- Debugging support for lazy cloning has been a bit improved.
265
266
+* nl/reset-patch-takes-a-tree (2019-11-25) 1 commit
267
+ (merged to 'next' on 2019-11-25 at 34dc348eaf)
268
+ + reset: parse rev as tree-ish in patch mode
269
148
-* pb/pretty-email-without-domain-part (2019-10-30) 3 commits
149
- (merged to 'next' on 2019-10-30 at 06f719efa5)
150
- + pretty: add "%aL" etc. to show local-part of email addresses
151
- + t4203: use test-lib.sh definitions
152
- + t6006: use test-lib.sh definitions
270
+ "git reset --patch $object" without any pathspec should allow a
271
+ tree object to be given, but incorrectly required a committish,
272
+ which has been corrected.
273
154
- The custom format for "git log --format=<format>" learned the l/L
155
- placeholder that is similar to e/E that fills in the e-mail
156
- address, but only the local part on the left side of '@'.
274
+ Will merge to 'master'.
275
276
159
-* pw/post-commit-from-sequencer (2019-10-16) 6 commits
160
- (merged to 'next' on 2019-10-18 at 15b41a097d)
161
- + sequencer: run post-commit hook
162
- + move run_commit_hook() to libgit and use it there
163
- + sequencer.h fix placement of #endif
164
- + t3404: remove uneeded calls to set_fake_editor
165
- + t3404: set $EDITOR in subshell
166
- + t3404: remove unnecessary subshell
277
+* pw/sequencer-compare-with-right-parent-to-check-empty-commits (2019-11-23) 1 commit
278
+ (merged to 'next' on 2019-11-25 at a4e4f06286)
279
+ + sequencer: fix empty commit check when amending
280
168
- "rebase -i" ceased to run post-commit hook by mistake in an earlier
169
- update, which has been corrected.
281
+ The sequencer machinery compared the HEAD and the state it is
282
+ attempting to commit to decide if the result would be a no-op
283
+ commit, even when amending a commit, which was incorrect, and
284
+ has been corrected.
285
286
+ Will merge to 'master'.
287
172
-* sg/commit-graph-usage-fix (2019-10-28) 1 commit
173
- (merged to 'next' on 2019-10-28 at 13d01506dd)
174
- + builtin/commit-graph.c: remove subcommand-less usage string
288
176
- Message fix.
289
+* sg/assume-no-todo-update-in-cherry-pick (2019-11-24) 1 commit
290
+ - sequencer: don't re-read todo for revert and cherry-pick
291
292
+ While running "revert" or "cherry-pick --edit" for multiple
293
+ commits, a recent regression incorrectly detected "nothing to
294
+ commit, working tree clean", instead of replaying the commits,
295
+ which has been corrected.
296
179
-* sg/dir-trie-fixes (2019-10-23) 5 commits
180
- (merged to 'next' on 2019-10-24 at 06d60a7fb0)
181
- + path.c: don't call the match function without value in trie_find()
182
- + path.c: clarify two field names in 'struct common_dir'
183
- + path.c: mark 'logs/HEAD' in 'common_list' as file
184
- + path.c: clarify trie_find()'s in-code comment
185
- + Documentation: mention more worktree-specific exceptions
297
+ Will merge to 'next'.
298
187
- Code clean-up and a bugfix in the logic used to tell worktree local
188
- and repository global refs apart.
299
300
+* sg/test-bool-env (2019-11-23) 2 commits
301
+ - t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
302
+ - tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
303
191
-* wb/midx-progress (2019-10-23) 6 commits
192
- (merged to 'next' on 2019-10-24 at 95c3e3ab3a)
193
- + multi-pack-index: add [--[no-]progress] option.
194
- + midx: honor the MIDX_PROGRESS flag in midx_repack
195
- + midx: honor the MIDX_PROGRESS flag in verify_midx_file
196
- + midx: add progress to expire_midx_packs
197
- + midx: add progress to write_midx_file
198
- + midx: add MIDX_PROGRESS flag
304
+ Recently we have declared that GIT_TEST_* variables take the
305
+ usual boolean values (it used to be that some used "non-empty
306
+ means true" and taking GIT_TEST_VAR=YesPlease as true); make
307
+ sure we notice and fail when non-bool strings are given to
308
+ these variables.
309
200
- The code to generate multi-pack index learned to show (or not to
201
- show) progress indicators.
310
+ Will merge to 'next'.
311
312
--------------------------------------------------
204
-[New Topics]
313
+[Stalled]
314
+
315
+* js/advise-rebase-skip (2019-10-23) 3 commits
316
+ - commit: give correct advice for empty commit during a rebase
317
+ - sequencer: export the function to get the path of `.git/rebase-merge/`
318
+ - cherry-pick: add test for `--skip` advice in `git commit`
319
+
320
+ The logic used in "git commit" to give hints and errors depending
321
+ on what operation was in progress learned to distinguish rebase and
322
+ cherry-pick better.
323
+
324
+ Kicked back to 'pu'.
325
+ cf. <nycvar.QRO.7.76.6.1911081508560.46@tvgsbejvaqbjf.bet>
326
+
327
+
328
+* vn/reset-deleted-ita (2019-07-26) 1 commit
329
+ - reset: unstage empty deleted ita files
330
+
331
+ "git reset HEAD [<pathspec>]" did not reset an empty file that was
332
+ added with the intent-to-add bit.
333
+
334
+ Expecting a reroll.
335
+
336
+
337
+* jn/unknown-index-extensions (2018-11-21) 2 commits
338
+ - index: offer advice for unknown index extensions
339
+ - index: do not warn about unrecognized extensions
340
+
341
+ A bit too alarming warning given when unknown index extensions
342
+ exist is getting revamped.
343
+
344
+ Expecting a reroll.
345
+
346
+
347
+* jc/format-patch-delay-message-id (2019-04-05) 1 commit
348
+ - format-patch: move message-id and related headers to the end
349
+
350
+ The location "git format-patch --thread" adds the Message-Id:
351
+ header in the series of header fields has been moved down, which
352
+ may help working around a suspected bug in GMail MSA, reported at
353
+ <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
354
+
355
+ Waiting for feedback to see if it truly helps.
356
+ Needs tests.
357
+
358
+
359
+* js/protocol-advertise-multi (2018-12-28) 1 commit
360
+ - protocol: advertise multiple supported versions
361
+
362
+ The transport layer has been updated so that the protocol version
363
+ used can be negotiated between the parties, by the initiator
364
+ listing the protocol versions it is willing to talk, and the other
365
+ side choosing from one of them.
366
+
367
+ Expecting a reroll.
368
+ cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
369
+
370
+
371
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
372
+ - zlib.c: use size_t for size
373
+
374
+ The wrapper to call into zlib followed our long tradition to use
375
+ "unsigned long" for sizes of regions in memory, which have been
376
+ updated to use "size_t".
377
+
378
+--------------------------------------------------
379
+[Cooking]
380
381
* rs/skip-iprefix (2019-11-10) 2 commits
382
(merged to 'next' on 2019-11-19 at c87ae31b14)
@@ -222,14 +397,14 @@ of the repositories listed at
397
Will merge to 'master'.
398
399
225
-* jh/userdiff-python-async (2019-11-11) 1 commit
226
- - userdiff: support Python async functions
400
+* jh/userdiff-python-async (2019-11-20) 1 commit
401
+ (merged to 'next' on 2019-11-25 at 74e4a4ed9f)
402
+ + userdiff: support Python async functions
403
404
The userdiff machinery has been taught that "async def" is another
405
way to begin a "function" in Python.
406
231
- Waiting for a response to review.
232
- cf. <f8a729c6-7b27-cac8-815e-b5c02a5c7b44@kdbg.org>
407
+ Will merge to 'master'.
408
409
410
* rj/bundle-ui-updates (2019-11-11) 3 commits
@@ -265,10 +440,10 @@ of the repositories listed at
440
Will merge to 'master'.
441
442
268
-* dl/pretty-reference (2019-11-19) 11 commits
269
- - squash! pretty: implement 'reference' format
443
+* dl/pretty-reference (2019-11-20) 11 commits
444
- SubmittingPatches: use `--pretty=reference`
445
- pretty: implement 'reference' format
446
+ - pretty: add struct cmt_fmt_map::default_date_mode_type
447
- pretty: provide short date format
448
- t4205: cover `git log --reflog -z` blindspot
449
- pretty.c: inline initalize format_context
@@ -282,8 +457,7 @@ of the repositories listed at
457
commit in the format that is often used to refer to it in log
458
messages.
459
285
- Expecting finishing touches to the data handling.
286
- Other than that, this is reasonably well done, I think.
460
+ Willl merge to 'next'.
461
462
463
* ds/test-read-graph (2019-11-13) 1 commit
@@ -321,6 +495,7 @@ of the repositories listed at
495
* jc/fsmonitor-sanity-fix (2019-11-13) 1 commit
496
(merged to 'next' on 2019-11-19 at 1fceb9b55b)
497
+ fsmonitor: do not compare bitmap size with size of split index
498
+ (this branch is used by us/unpack-trees-fsmonitor.)
499
500
Remove an incorrect BUG() that should not trigger.
501
@@ -395,8 +570,9 @@ of the repositories listed at
570
571
572
* js/rebase-r-safer-label (2019-11-18) 2 commits
398
- - rebase -r: let `label` generate safer labels
399
- - rebase-merges: move labels' whitespace mangling into `label_oid()`
573
+ (merged to 'next' on 2019-11-21 at 791d51b0d7)
574
+ + rebase -r: let `label` generate safer labels
575
+ + rebase-merges: move labels' whitespace mangling into `label_oid()`
576
(this branch is used by dd/rebase-merge-reserves-onto-label.)
577
578
A label used in the todo list that are generated by "git rebase
@@ -404,11 +580,12 @@ of the repositories listed at
580
up with the label has been tightened to avoid names that cannot be
581
used as such.
582
407
- Will merge to 'next'.
583
+ Will merge to 'master'.
584
585
410
-* dd/rebase-merge-reserves-onto-label (2019-11-19) 1 commit
411
- - sequencer: handle rebase-merge for "onto" message
586
+* dd/rebase-merge-reserves-onto-label (2019-11-20) 1 commit
587
+ (merged to 'next' on 2019-11-21 at a6e4e5af0a)
588
+ + sequencer: handle rebase-merges for "onto" message
589
(this branch uses js/rebase-r-safer-label.)
590
591
The logic to avoid duplicate label names generated by "git rebase
@@ -416,7 +593,7 @@ of the repositories listed at
593
label name, which must be avoided by auto-generated labels, which
594
has been corrected.
595
419
- Will merge to 'next'.
596
+ Will merge to 'master'.
597
598
599
* ma/config-bool-valex (2019-11-14) 8 commits
@@ -500,80 +677,12 @@ of the repositories listed at
677
678
Will merge to 'master'.
679
503
---------------------------------------------------
504
-[Stalled]
505
-
506
-* js/advise-rebase-skip (2019-10-23) 3 commits
507
- - commit: give correct advice for empty commit during a rebase
508
- - sequencer: export the function to get the path of `.git/rebase-merge/`
509
- - cherry-pick: add test for `--skip` advice in `git commit`
510
-
511
- The logic used in "git commit" to give hints and errors depending
512
- on what operation was in progress learned to distinguish rebase and
513
- cherry-pick better.
514
-
515
- Kicked back to 'pu'.
516
- cf. <nycvar.QRO.7.76.6.1911081508560.46@tvgsbejvaqbjf.bet>
517
-
518
-
519
-* vn/reset-deleted-ita (2019-07-26) 1 commit
520
- - reset: unstage empty deleted ita files
521
-
522
- "git reset HEAD [<pathspec>]" did not reset an empty file that was
523
- added with the intent-to-add bit.
524
-
525
- Expecting a reroll.
526
-
527
-
528
-* jn/unknown-index-extensions (2018-11-21) 2 commits
529
- - index: offer advice for unknown index extensions
530
- - index: do not warn about unrecognized extensions
531
-
532
- A bit too alarming warning given when unknown index extensions
533
- exist is getting revamped.
534
-
535
- Expecting a reroll.
536
-
537
-
538
-* jc/format-patch-delay-message-id (2019-04-05) 1 commit
539
- - format-patch: move message-id and related headers to the end
540
-
541
- The location "git format-patch --thread" adds the Message-Id:
542
- header in the series of header fields has been moved down, which
543
- may help working around a suspected bug in GMail MSA, reported at
544
- <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
545
-
546
- Waiting for feedback to see if it truly helps.
547
- Needs tests.
548
-
549
-
550
-* js/protocol-advertise-multi (2018-12-28) 1 commit
551
- - protocol: advertise multiple supported versions
552
-
553
- The transport layer has been updated so that the protocol version
554
- used can be negotiated between the parties, by the initiator
555
- listing the protocol versions it is willing to talk, and the other
556
- side choosing from one of them.
557
-
558
- Expecting a reroll.
559
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
560
-
561
-
562
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
563
- - zlib.c: use size_t for size
564
-
565
- The wrapper to call into zlib followed our long tradition to use
566
- "unsigned long" for sizes of regions in memory, which have been
567
- updated to use "size_t".
568
-
569
---------------------------------------------------
570
-[Cooking]
680
572
-* am/pathspec-from-file (2019-11-07) 6 commits
681
+* am/pathspec-from-file (2019-11-20) 6 commits
682
- commit: support the --pathspec-from-file option
574
- - doc: commit: unify <pathspec> description
683
+ - doc: commit: synchronize <pathspec> description
684
- reset: support the `--pathspec-from-file` option
576
- - doc: reset: unify <pathspec> description
685
+ - doc: reset: synchronize <pathspec> description
686
- pathspec: add new function to parse file
687
- parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
688
@@ -581,8 +690,7 @@ of the repositories listed at
690
standard input or a named file, instead of taking it as the command
691
line arguments.
692
584
- Expecting a response to review.
585
- This smells more or less done.
693
+ Will merge to 'next'.
694
695
696
* cb/curl-use-xmalloc (2019-11-07) 1 commit
@@ -595,23 +703,13 @@ of the repositories listed at
703
Will merge to 'master'.
704
705
598
-* ds/commit-graph-delay-gen-progress (2019-11-07) 1 commit
599
- (merged to 'next' on 2019-11-19 at afa7c921be)
600
- + commit-graph: use start_delayed_progress()
601
-
602
- One kind of progress messages were always given during commit-graph
603
- generation, instead of following the "if it takes more than two
604
- seconds, show progress" pattern, which has been corrected.
605
-
606
- Will merge to 'master'.
607
-
608
-
609
-* ec/fetch-mark-common-refs-trace2 (2019-11-07) 1 commit
610
- - fetch: add trace2 instrumentation
706
+* ec/fetch-mark-common-refs-trace2 (2019-11-20) 1 commit
707
+ (merged to 'next' on 2019-11-25 at c2b8e1546c)
708
+ + fetch: add trace2 instrumentation
709
710
Trace2 annotation.
711
614
- Expecting a response to review.
712
+ Will merge to 'master'.
713
714
715
* en/misc-doc-fixes (2019-11-07) 3 commits
@@ -635,11 +733,12 @@ of the repositories listed at
733
734
735
* ep/guard-kset-tar-headers (2019-11-07) 1 commit
638
- - kset.h, tar.h: add missing header guard to prevent multiple inclusion
736
+ (merged to 'next' on 2019-11-21 at 6c9574b01d)
737
+ + kset.h, tar.h: add missing header guard to prevent multiple inclusion
738
739
Code clean-up.
740
642
- Will merge to 'next'.
741
+ Will merge to 'master'.
742
743
744
* js/fetch-multi-lockfix (2019-11-06) 2 commits
@@ -734,7 +833,7 @@ of the repositories listed at
833
Will merge to 'master'.
834
835
737
-* dl/t5520-cleanup (2019-11-19) 14 commits
836
+* dl/t5520-cleanup (2019-11-21) 15 commits
837
- t5520: replace `! git` with `test_must_fail git`
838
- t5520: remove redundant lines in test cases
839
- t5520: replace $(cat ...) comparison with test_cmp
@@ -749,6 +848,7 @@ of the repositories listed at
848
- t5520: use sq for test case names
849
- t5520: improve test style
850
- t: teach test_cmp_rev to accept ! for not-equals
851
+ - t0000: test multiple local assignment
852
853
Test cleanup.
854
@@ -756,20 +856,21 @@ of the repositories listed at
856
857
858
* js/builtin-add-i (2019-11-18) 9 commits
759
- - built-in add -i: implement the `help` command
760
- - built-in add -i: use color in the main loop
761
- - built-in add -i: support `?` (prompt help)
762
- - built-in add -i: show unique prefixes of the commands
763
- - built-in add -i: implement the main loop
764
- - built-in add -i: color the header in the `status` command
765
- - built-in add -i: implement the `status` command
766
- - diff: export diffstat interface
767
- - Start to implement a built-in version of `git add --interactive`
859
+ (merged to 'next' on 2019-11-21 at caefa55b89)
860
+ + built-in add -i: implement the `help` command
861
+ + built-in add -i: use color in the main loop
862
+ + built-in add -i: support `?` (prompt help)
863
+ + built-in add -i: show unique prefixes of the commands
864
+ + built-in add -i: implement the main loop
865
+ + built-in add -i: color the header in the `status` command
866
+ + built-in add -i: implement the `status` command
867
+ + diff: export diffstat interface
868
+ + Start to implement a built-in version of `git add --interactive`
869
(this branch is used by js/builtin-add-i-cmds.)
870
871
The beginning of rewriting "git add -i" in C.
872
772
- Will merge to 'next'.
873
+ Will merge to 'master'.
874
875
876
* es/myfirstcontrib-updates (2019-11-02) 3 commits
@@ -792,7 +893,8 @@ of the repositories listed at
893
Will merge to 'master'.
894
895
795
-* ra/rebase-i-more-options (2019-11-02) 6 commits
896
+* ra/rebase-i-more-options (2019-11-25) 7 commits
897
+ - rebase -i: finishing touches to --reset-author-date
898
- rebase: add --reset-author-date
899
- rebase -i: support --ignore-date
900
- sequencer: rename amend_author to author_to_rename
@@ -803,6 +905,8 @@ of the repositories listed at
905
"git rebase -i" learned a few options that are known by "git
906
rebase" proper.
907
908
+ Will merge to 'next'.
909
+
910
911
* en/doc-typofix (2019-11-10) 10 commits
912
(merged to 'next' on 2019-11-19 at e7bfe50de5)
@@ -882,7 +986,7 @@ of the repositories listed at
986
987
"git worktree add" internally calls "reset --hard" that should not
988
descend into submodules, even when submodule.recurse configuration
885
- is set, but it was affected. This has been correct.
989
+ is set, but it was affected. This has been corrected.
990
991
Will merge to 'master'.
992
@@ -984,34 +1088,7 @@ of the repositories listed at
1088
Will merge to 'master'.
1089
1090
987
-* ds/sparse-cone (2019-10-23) 17 commits
988
- (merged to 'next' on 2019-11-19 at 1eb4b3a012)
989
- + sparse-checkout: cone mode should not interact with .gitignore
990
- + sparse-checkout: write using lockfile
991
- + sparse-checkout: update working directory in-process
992
- + sparse-checkout: sanitize for nested folders
993
- + read-tree: show progress by default
994
- + unpack-trees: add progress to clear_ce_flags()
995
- + unpack-trees: hash less in cone mode
996
- + sparse-checkout: init and set in cone mode
997
- + sparse-checkout: use hashmaps for cone patterns
998
- + sparse-checkout: add 'cone' mode
999
- + trace2: add region in clear_ce_flags
1000
- + sparse-checkout: create 'disable' subcommand
1001
- + sparse-checkout: add '--stdin' option to set subcommand
1002
- + sparse-checkout: 'set' subcommand
1003
- + clone: add --sparse mode
1004
- + sparse-checkout: create 'init' subcommand
1005
- + sparse-checkout: create builtin with 'list' subcommand
1006
-
1007
- Management of sparsely checked-out working tree has gained a
1008
- dedicated "sparse-checkout" command.
1009
-
1010
- Will merge to 'master'.
1011
-
1012
-
1013
-* ag/sequencer-todo-updates (2019-10-28) 6 commits
1014
- - SQUASH??? tentative leakfix
1091
+* ag/sequencer-todo-updates (2019-11-25) 5 commits
1092
- sequencer: directly call pick_commits() from complete_action()
1093
- rebase: fill `squash_onto' in get_replay_opts()
1094
- sequencer: move the code writing total_nr on the disk to a new function
@@ -1021,8 +1098,7 @@ of the repositories listed at
1098
Reduce unnecessary reading of state variables back from the disk
1099
during sequener operation.
1100
1024
- Is the leakfix patch at the tip the only thing that needs to
1025
- prepare the topic ready for 'next'?
1101
+ Will merge to 'next'.
1102
1103
1104
* mt/threaded-grep-in-object-store (2019-10-02) 11 commits
@@ -1061,4 +1137,5 @@ of the repositories listed at
1137
The way "git pack-objects" reuses objects stored in existing pack
1138
to generate its result has been improved.
1139
1064
- Will merge to 'master'.
1140
+ Hold. There is an update to these patches that currently are on 'next'.
1141
+ cf. <20191115180319.113991-1-jonathantanmy@google.com>