What's cooking (2019/11 #03)
Junio C Hamano committed
Nov 19, 2019 at 16:04 UTC
0e6245a44595b3d1c3edcf4bbddd03a84537b30d
1 file changed
+712
-416
whats-cooking.txt
+712
-416
@@ -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, #02; Fri, 8)
4
-X-master-at: da72936f544fec5a335e66432610e4cef4430991
5
-X-next-at: 68dc17040922b37729d89a2dbc01e41fbefdea8f
3
+Subject: What's cooking in git.git (Nov 2019, #03; Tue, 19)
4
+X-master-at: d9f6f3b6195a0ca35642561e530798ad1469bd41
5
+X-next-at: 69ef04c0130f4b0b2f74006aac01f51233c7f246
6
7
-What's cooking in git.git (Nov 2019, #02; Fri, 8)
7
+What's cooking in git.git (Nov 2019, #03; Tue, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,22 +12,563 @@ 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
-Git 2.24 has been tagged. Hopefully there needs no immediate brown
16
-paper bag fixes needed for the 'master' branch. The next cycle will
17
-start perhaps early next week by first rewinding the 'next' branch,
18
-after the dust settles. Topics marked as "will cook in next" can be
19
-given a fresh start by ejecting them from 'next' and queueing a new
20
-version (please just ask). Topics currently not in 'next' will then
21
-start getting merged down after all that.
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 ;-)
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
22
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
+--------------------------------------------------
26
+[Graduated to "master"]
27
+
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
45
+
46
+ Test updates to prepare for SHA-2 transition continues.
47
+
48
+
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
53
+
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
+
58
+
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
66
+
67
+ "git apply --3way" learned to honor merge.conflictStyle
68
+ configuration variable, like merges would.
69
+
70
+
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
76
+
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
+
82
+
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
+
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.
93
+
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
98
+
99
+ A tutorial on object enumeration.
100
+
101
+
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
105
+
106
+ Move the definition of a set of bitmask constants from 0ctal
107
+ literal to (1U<<count) notation.
108
+
109
+
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
113
+
114
+ Docfix.
115
+
116
+
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
120
+
121
+ Doc update.
122
+
123
+
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
127
+
128
+ "git rebase --preserve-merges" has been marked as deprecated; this
129
+ release stops advertising it in the "git rebase -h" output.
130
+
131
+
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
136
+
137
+ "git stash save" in a working tree that is sparsely checked out
138
+ mistakenly removed paths that are outside the area of interest.
139
+
140
+
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
144
+
145
+ Debugging support for lazy cloning has been a bit improved.
146
+
147
+
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
153
+
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 '@'.
157
+
158
+
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
167
+
168
+ "rebase -i" ceased to run post-commit hook by mistake in an earlier
169
+ update, which has been corrected.
170
+
171
+
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
175
+
176
+ Message fix.
177
+
178
+
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
186
+
187
+ Code clean-up and a bugfix in the logic used to tell worktree local
188
+ and repository global refs apart.
189
+
190
+
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
199
+
200
+ The code to generate multi-pack index learned to show (or not to
201
+ show) progress indicators.
202
+
203
--------------------------------------------------
204
[New Topics]
205
206
+* rs/skip-iprefix (2019-11-10) 2 commits
207
+ (merged to 'next' on 2019-11-19 at c87ae31b14)
208
+ + convert: use skip_iprefix() in validate_encoding()
209
+ + utf8: use skip_iprefix() in same_utf_encoding()
210
+
211
+ Code simplification.
212
+
213
+ Will merge to 'master'.
214
+
215
+
216
+* dj/typofix-merge-strat (2019-11-11) 1 commit
217
+ (merged to 'next' on 2019-11-19 at 5b6c0cf125)
218
+ + merge-strategies: fix typo "reflected to" to "reflected in"
219
+
220
+ Typofix.
221
+
222
+ Will merge to 'master'.
223
+
224
+
225
+* jh/userdiff-python-async (2019-11-11) 1 commit
226
+ - userdiff: support Python async functions
227
+
228
+ The userdiff machinery has been taught that "async def" is another
229
+ way to begin a "function" in Python.
230
+
231
+ Waiting for a response to review.
232
+ cf. <f8a729c6-7b27-cac8-815e-b5c02a5c7b44@kdbg.org>
233
+
234
+
235
+* rj/bundle-ui-updates (2019-11-11) 3 commits
236
+ (merged to 'next' on 2019-11-19 at d88f626256)
237
+ + bundle-verify: add --quiet
238
+ + bundle-create: progress output control
239
+ + bundle: framework for options before bundle file
240
+
241
+ "git bundle" has been taught to use the parse options API. "git
242
+ bundle verify" learned "--quiet" and "git bundle create" learned
243
+ options to control the progress output.
244
+
245
+ Will merge to 'master'.
246
+
247
+
248
+* ar/install-doc-update-cmds-needing-the-shell (2019-11-15) 1 commit
249
+ (merged to 'next' on 2019-11-19 at 216468eb98)
250
+ + INSTALL: use existing shell scripts as example
251
+
252
+ Doc update.
253
+
254
+ Will merge to 'master'.
255
+
256
+
257
+* dl/complete-rebase-onto (2019-11-12) 1 commit
258
+ (merged to 'next' on 2019-11-19 at ba53946a3b)
259
+ + completion: learn to complete `git rebase --onto=`
260
+
261
+ The completion script (in contrib/) learned that the "--onto"
262
+ option of "git rebase" can take its argument as the value of the
263
+ option.
264
+
265
+ Will merge to 'master'.
266
+
267
+
268
+* dl/pretty-reference (2019-11-19) 11 commits
269
+ - squash! pretty: implement 'reference' format
270
+ - SubmittingPatches: use `--pretty=reference`
271
+ - pretty: implement 'reference' format
272
+ - pretty: provide short date format
273
+ - t4205: cover `git log --reflog -z` blindspot
274
+ - pretty.c: inline initalize format_context
275
+ - revision: make get_revision_mark() return const pointer
276
+ - completion: complete `tformat:` pretty format
277
+ - SubmittingPatches: remove dq from commit reference
278
+ - pretty-formats.txt: use generic terms for hash
279
+ - SubmittingPatches: use generic terms for hash
280
+
281
+ "git log" family learned "--pretty=ref" that gives the name of a
282
+ commit in the format that is often used to refer to it in log
283
+ messages.
284
+
285
+ Expecting finishing touches to the data handling.
286
+ Other than that, this is reasonably well done, I think.
287
+
288
+
289
+* ds/test-read-graph (2019-11-13) 1 commit
290
+ (merged to 'next' on 2019-11-19 at 80152fc082)
291
+ + test-tool: use 'read-graph' helper
292
+
293
+ Dev support for commit-graph feature.
294
+
295
+ Will merge to 'master'.
296
+
297
+
298
+* hw/doc-in-header (2019-11-18) 20 commits
299
+ - trace2: move doc to trace2.h
300
+ - submodule-config: move doc to submodule-config.h
301
+ - tree-walk: move doc to tree-walk.h
302
+ - trace: move doc to trace.h
303
+ - run-command: move doc to run-command.h
304
+ - parse-options: add link to doc file in parse-options.h
305
+ - credential: move doc to credential.h
306
+ - argv-array: move doc to argv-array.h
307
+ - cache: move doc to cache.h
308
+ - sigchain: move doc to sigchain.h
309
+ - pathspec: move doc to pathspec.h
310
+ - revision: move doc to revision.h
311
+ - attr: move doc to attr.h
312
+ - refs: move doc to refs.h
313
+ - remote: move doc to remote.h and refspec.h
314
+ - sha1-array: move doc to sha1-array.h
315
+ - merge: move doc to ll-merge.h
316
+ - graph: move doc to graph.h and graph.c
317
+ - dir: move doc to dir.h
318
+ - diff: move doc to diff.h and diffcore.h
319
+
320
+
321
+* jc/fsmonitor-sanity-fix (2019-11-13) 1 commit
322
+ (merged to 'next' on 2019-11-19 at 1fceb9b55b)
323
+ + fsmonitor: do not compare bitmap size with size of split index
324
+
325
+ Remove an incorrect BUG() that should not trigger.
326
+
327
+ Will merge to 'master'.
328
+
329
+
330
+* jk/gitweb-anti-xss (2019-11-18) 4 commits
331
+ (merged to 'next' on 2019-11-19 at 69ef04c013)
332
+ + gitweb: escape URLs generated by href()
333
+ + t/gitweb-lib.sh: set $REQUEST_URI
334
+ + t/gitweb-lib.sh: drop confusing quotes
335
+ + t9502: pass along all arguments in xss helper
336
+
337
+ Some codepaths in "gitweb" that forgot to escape URLs generated
338
+ based on end-user input have been corrected.
339
+
340
+ Will merge to 'master'.
341
+
342
+
343
+* jk/optim-in-pack-idx-conversion (2019-11-12) 1 commit
344
+ (merged to 'next' on 2019-11-19 at a81ebc7b8d)
345
+ + pack-objects: avoid pointless oe_map_new_pack() calls
346
+
347
+ Code clean-up.
348
+
349
+ Will merge to 'master'.
350
+
351
+
352
+* jk/remove-sha1-to-hex (2019-11-13) 2 commits
353
+ (merged to 'next' on 2019-11-19 at fb68824870)
354
+ + hex: drop sha1_to_hex()
355
+ + hex: drop sha1_to_hex_r()
356
+
357
+ Code clean-up.
358
+
359
+ Will merge to 'master'.
360
+
361
+
362
+* jk/send-pack-remote-failure (2019-11-13) 1 commit
363
+ (merged to 'next' on 2019-11-19 at d02c0107ee)
364
+ + send-pack: check remote ref status on pack-objects failure
365
+
366
+ Error handling after "git push" finishes sending the packdata and
367
+ waits for the response to the remote side has been improved.
368
+
369
+ Will merge to 'master'.
370
+
371
+
372
+* js/builtin-add-i-cmds (2019-11-18) 8 commits
373
+ - built-in add -i: offer the `quit` command
374
+ - built-in add -i: re-implement the `diff` command
375
+ - built-in add -i: implement the `patch` command
376
+ - built-in add -i: re-implement `add-untracked` in C
377
+ - built-in add -i: re-implement `revert` in C
378
+ - built-in add -i: implement the `update` command
379
+ - built-in add -i: prepare for multi-selection commands
380
+ - built-in add -i: allow filtering the modified files list
381
+ (this branch uses js/builtin-add-i.)
382
+
383
+ "git add -i" that is getting rewritten in C has been extended to
384
+ cover subcommands other than the "patch".
385
+
386
+
387
+* js/complete-svn-recursive (2019-11-13) 1 commit
388
+ (merged to 'next' on 2019-11-19 at fa2a97911c)
389
+ + completion: tab-complete "git svn --recursive"
390
+
391
+ The completion script (in contrib/) has been taught that "git svn"
392
+ supports the "--recursive" option.
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
+* 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()`
400
+ (this branch is used by dd/rebase-merge-reserves-onto-label.)
401
+
402
+ A label used in the todo list that are generated by "git rebase
403
+ --rebase-merges" is used as a part of a refname; the logic to come
404
+ up with the label has been tightened to avoid names that cannot be
405
+ used as such.
406
+
407
+ Will merge to 'next'.
408
+
409
+
410
+* dd/rebase-merge-reserves-onto-label (2019-11-19) 1 commit
411
+ - sequencer: handle rebase-merge for "onto" message
412
+ (this branch uses js/rebase-r-safer-label.)
413
+
414
+ The logic to avoid duplicate label names generated by "git rebase
415
+ --rebase-merges" forgot that the machinery itself uses "onto" as a
416
+ label name, which must be avoided by auto-generated labels, which
417
+ has been corrected.
418
+
419
+ Will merge to 'next'.
420
+
421
+
422
+* ma/config-bool-valex (2019-11-14) 8 commits
423
+ - builtin/config: die if "value_regex" doesn't canonicalize as boolean
424
+ - builtin/config: warn if "value_regex" doesn't canonicalize as boolean
425
+ - builtin/config: canonicalize "value_regex" with `--type=bool-or-int`
426
+ - builtin/config: canonicalize "value_regex" with `--type=bool`
427
+ - builtin/config: collect "value_regexp" data in a struct
428
+ - builtin/config: extract `handle_value_regex()` from `get_value()`
429
+ - t1300: modernize part of script
430
+ - config: make `git_parse_maybe_bool_text()` public
431
+
432
+
433
+* ma/t7004 (2019-11-14) 1 commit
434
+ (merged to 'next' on 2019-11-19 at 789a0a0f05)
435
+ + t7004: check existence of correct tag
436
+
437
+ Test fix.
438
+
439
+ Will merge to 'master'.
440
+
441
+
442
+* nn/doc-rebase-merges (2019-11-12) 1 commit
443
+ (merged to 'next' on 2019-11-19 at db74ff488c)
444
+ + doc: improve readability of --rebase-merges in git-rebase
445
+
446
+ Doc update.
447
+
448
+ Will merge to 'master'.
449
+
450
+
451
+* rs/parse-options-dup-null-fix (2019-11-13) 1 commit
452
+ (merged to 'next' on 2019-11-19 at 73040e1605)
453
+ + parse-options: avoid arithmetic on pointer that's potentially NULL
454
+
455
+ Code cleanup.
456
+
457
+ Will merge to 'master'.
458
+
459
+
460
+* rs/use-copy-array-in-mingw-shell-command-preparation (2019-11-13) 1 commit
461
+ (merged to 'next' on 2019-11-19 at 52ee6a8887)
462
+ + mingw: use COPY_ARRAY for copying array
463
+
464
+ Code cleanup.
465
+
466
+ Will merge to 'master'.
467
+
468
+
469
+* sg/name-rev-wo-recursion (2019-11-13) 13 commits
470
+ - name-rev: cleanup name_ref()
471
+ - name-rev: eliminate recursion in name_rev()
472
+ - name-rev: drop name_rev()'s 'generation' and 'distance' parameters
473
+ - name-rev: restructure creating/updating 'struct rev_name' instances
474
+ - name-rev: restructure parsing commits and applying date cutoff
475
+ - name-rev: pull out deref handling from the recursion
476
+ - name-rev: extract creating/updating a 'struct name_rev' into a helper
477
+ - t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
478
+ - name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
479
+ - name-rev: avoid unnecessary cast in name_ref()
480
+ - name-rev: use strbuf_strip_suffix() in get_rev_name()
481
+ - t6120-describe: modernize the 'check_describe' helper
482
+ - t6120-describe: correct test repo history graph in comment
483
+
484
+
485
+* sg/skip-skipped-prereq (2019-11-13) 1 commit
486
+ (merged to 'next' on 2019-11-19 at 10d344fed7)
487
+ + test-lib: don't check prereqs of test cases that won't be run anyway
488
+
489
+ Test update to avoid wasted cycles.
490
+
491
+ Will merge to 'master'.
492
+
493
+
494
+* tg/stash-refresh-index (2019-11-14) 1 commit
495
+ (merged to 'next' on 2019-11-19 at 4d67af8d3f)
496
+ + stash: make sure we have a valid index before writing it
497
+
498
+ Recent update to "git stash pop" made the command empty the index
499
+ when run with the "--quiet" option, which has been corrected.
500
+
501
+ Will merge to 'master'.
502
+
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]
571
+
572
* am/pathspec-from-file (2019-11-07) 6 commits
573
- commit: support the --pathspec-from-file option
574
- doc: commit: unify <pathspec> description
@@ -40,26 +581,29 @@ of the repositories listed at
581
standard input or a named file, instead of taking it as the command
582
line arguments.
583
43
- Will merge to 'next'.
584
+ Expecting a response to review.
585
+ This smells more or less done.
586
587
588
* cb/curl-use-xmalloc (2019-11-07) 1 commit
47
- - remote-curl: unbreak http.extraHeader with custom allocators
589
+ (merged to 'next' on 2019-11-19 at 1c587d0775)
590
+ + remote-curl: unbreak http.extraHeader with custom allocators
591
592
HTTP transport had possible allocator/deallocator mismatch, which
593
has been corrected.
594
52
- Will merge to 'next'.
595
+ Will merge to 'master'.
596
597
598
* ds/commit-graph-delay-gen-progress (2019-11-07) 1 commit
56
- - commit-graph: use start_delayed_progress()
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
62
- Will merge to 'next'.
606
+ Will merge to 'master'.
607
608
609
* ec/fetch-mark-common-refs-trace2 (2019-11-07) 1 commit
@@ -71,21 +615,23 @@ of the repositories listed at
615
616
617
* en/misc-doc-fixes (2019-11-07) 3 commits
74
- - name-hash.c: remove duplicate word in comment
75
- - hashmap: fix documentation misuses of -> versus .
76
- - git-filter-branch.txt: correct argument name typo
618
+ (merged to 'next' on 2019-11-19 at 7222cf3720)
619
+ + name-hash.c: remove duplicate word in comment
620
+ + hashmap: fix documentation misuses of -> versus .
621
+ + git-filter-branch.txt: correct argument name typo
622
623
Misc doc fixes.
624
80
- Will merge to 'next'.
625
+ Will merge to 'master'.
626
627
628
* en/t6024-style (2019-11-07) 1 commit
84
- - t6024: modernize style
629
+ (merged to 'next' on 2019-11-19 at b41c2ed21b)
630
+ + t6024: modernize style
631
632
Test updates.
633
88
- Will merge to 'next'.
634
+ Will merge to 'master'.
635
636
637
* ep/guard-kset-tar-headers (2019-11-07) 1 commit
@@ -97,165 +643,119 @@ of the repositories listed at
643
644
645
* js/fetch-multi-lockfix (2019-11-06) 2 commits
100
- - fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
101
- - fetch: add the command-line option `--write-commit-graph`
646
+ (merged to 'next' on 2019-11-19 at b9683b7ec9)
647
+ + fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
648
+ + fetch: add the command-line option `--write-commit-graph`
649
650
Fetching from multiple remotes into the same repository in parallel
651
had a bad interaction with the recent change to (optionally) update
652
the commit-graph after a fetch job finishes, as these parallel
653
fetches compete with each other. Which has been corrected.
654
108
- Will merge to 'next'.
655
+ Will merge to 'master'.
656
657
111
-* jt/fetch-remove-lazy-fetch-plugging (2019-11-06) 1 commit
112
- - fetch: remove fetch_if_missing=0
658
+* jt/fetch-remove-lazy-fetch-plugging (2019-11-13) 3 commits
659
+ (merged to 'next' on 2019-11-19 at 1b26c28dcd)
660
+ + promisor-remote: remove fetch_if_missing=0
661
+ + clone: remove fetch_if_missing=0
662
+ + fetch: remove fetch_if_missing=0
663
664
"git fetch" codepath had a big "do not lazily fetch missing objects
665
when I ask if something exists" switch. This has been corrected by
666
marking the "does this thing exist?" calls with "if not please do not
667
lazily fetch it" flag.
668
119
- Will merge to 'next'.
669
+ Will merge to 'master'.
670
671
672
* kw/fsmonitor-watchman-fix (2019-11-06) 1 commit
123
- - fsmonitor: fix watchman integration
673
+ (merged to 'next' on 2019-11-19 at ee786a5c39)
674
+ + fsmonitor: fix watchman integration
675
676
The watchman integration for fsmonitor was racy, which has been
677
corrected to be more conservative.
678
128
- Will merge to 'next'.
679
+ Will merge to 'master'.
680
681
131
-* ln/userdiff-elixir (2019-11-08) 1 commit
132
- - userdiff: add Elixir to supported languages
682
+* ln/userdiff-elixir (2019-11-10) 1 commit
683
+ (merged to 'next' on 2019-11-19 at 6318918ba8)
684
+ + userdiff: add Elixir to supported userdiff languages
685
686
The patterns to detect function boundary for Elixir language has
687
been added.
688
137
- Will merge to 'next'.
689
+ Will merge to 'master'.
690
691
692
* ns/test-desc-typofix (2019-11-07) 1 commit
141
- - t: fix typo in test descriptions
693
+ (merged to 'next' on 2019-11-19 at 804861f385)
694
+ + t: fix typo in test descriptions
695
696
Typofix.
697
145
- Will merge to 'next'.
698
+ Will merge to 'master'.
699
700
148
-* py/shortlog-list-options-for-log (2019-11-06) 1 commit
149
- - git-shortlog.txt: include commit limiting options
701
+* py/shortlog-list-options-for-log (2019-11-10) 1 commit
702
+ (merged to 'next' on 2019-11-19 at 92a10e39f7)
703
+ + git-shortlog.txt: include commit limiting options
704
705
Documentation pages for "git shortlog" now lists commit limiting
706
options explicitly.
707
154
- Expecting a reroll.
155
- It excludes too much (e.g. the section for pathspec based history
156
- simplification) in a way that makes future shuffling of sections
157
- in rev-list-options.txt error prone.
708
+ Will merge to 'master'.
709
710
711
* rs/trace2-dots (2019-11-06) 1 commit
161
- - trace2: add dots directly to strbuf in perf_fmt_prepare()
712
+ (merged to 'next' on 2019-11-19 at a045233ad0)
713
+ + trace2: add dots directly to strbuf in perf_fmt_prepare()
714
715
Code cleanup.
716
165
- Will merge to 'next'.
717
+ Will merge to 'master'.
718
719
168
-* dd/sequencer-utf8 (2019-11-07) 8 commits
169
- - sequencer: reencode commit message for am/rebase --show-current-patch
170
- - sequencer: reencode old merge-commit message
171
- - sequencer: reencode squashing commit's message
172
- - sequencer: reencode revert/cherry-pick's todo list
173
- - sequencer: reencode to utf-8 before arrange rebase's todo list
174
- - t3900: demonstrate git-rebase problem with multi encoding
175
- - configure.ac: define ICONV_OMITS_BOM if necessary
176
- - t0028: eliminate non-standard usage of printf
720
+* dd/sequencer-utf8 (2019-11-11) 8 commits
721
+ (merged to 'next' on 2019-11-19 at 9432ddc32c)
722
+ + sequencer: reencode commit message for am/rebase --show-current-patch
723
+ + sequencer: reencode old merge-commit message
724
+ + sequencer: reencode squashing commit's message
725
+ + sequencer: reencode revert/cherry-pick's todo list
726
+ + sequencer: reencode to utf-8 before arrange rebase's todo list
727
+ + t3900: demonstrate git-rebase problem with multi encoding
728
+ + configure.ac: define ICONV_OMITS_BOM if necessary
729
+ + t0028: eliminate non-standard usage of printf
730
731
Handling of commit objects that use non UTF-8 encoding during
732
"rebase -i" has been improved.
733
734
+ Will merge to 'master'.
735
182
-* dl/t5520-cleanup (2019-11-08) 14 commits
736
+
737
+* dl/t5520-cleanup (2019-11-19) 14 commits
738
- t5520: replace `! git` with `test_must_fail git`
739
- t5520: remove redundant lines in test cases
185
- - t5520: replace subshell cat comparison with test_cmp
740
+ - t5520: replace $(cat ...) comparison with test_cmp
741
- t5520: don't put git in upstream of pipe
742
- t5520: test single-line files by git with test_cmp
743
- t5520: use test_cmp_rev where possible
744
- t5520: replace test -{n,z} with test-lib functions
190
- - t5520: use test_line_count where possible
191
- - t5520: remove spaces after redirect operator
192
- - t5520: replace test -f with test-lib functions
193
- - t5520: let sed open its own input
194
- - t5520: use sq for test case names
195
- - t5520: improve test style
196
- - t: teach test_cmp_rev to accept ! for not-equals
197
-
198
- Test cleanup.
199
-
200
- Expecting a response to review.
201
-
202
---------------------------------------------------
203
-[Stalled]
204
-
205
-* vn/reset-deleted-ita (2019-07-26) 1 commit
206
- - reset: unstage empty deleted ita files
207
-
208
- "git reset HEAD [<pathspec>]" did not reset an empty file that was
209
- added with the intent-to-add bit.
210
-
211
- Expecting a reroll.
212
-
213
-
214
-* jn/unknown-index-extensions (2018-11-21) 2 commits
215
- - index: offer advice for unknown index extensions
216
- - index: do not warn about unrecognized extensions
217
-
218
- A bit too alarming warning given when unknown index extensions
219
- exist is getting revamped.
220
-
221
- Expecting a reroll.
222
-
223
-
224
-* jc/format-patch-delay-message-id (2019-04-05) 1 commit
225
- - format-patch: move message-id and related headers to the end
226
-
227
- The location "git format-patch --thread" adds the Message-Id:
228
- header in the series of header fields has been moved down, which
229
- may help working around a suspected bug in GMail MSA, reported at
230
- <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
231
-
232
- Waiting for feedback to see if it truly helps.
233
- Needs tests.
234
-
235
-
236
-* js/protocol-advertise-multi (2018-12-28) 1 commit
237
- - protocol: advertise multiple supported versions
238
-
239
- The transport layer has been updated so that the protocol version
240
- used can be negotiated between the parties, by the initiator
241
- listing the protocol versions it is willing to talk, and the other
242
- side choosing from one of them.
243
-
244
- Expecting a reroll.
245
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
246
-
745
+ - t5520: use test_line_count where possible
746
+ - t5520: remove spaces after redirect operator
747
+ - t5520: replace test -f with test-lib functions
748
+ - t5520: let sed open its own input
749
+ - t5520: use sq for test case names
750
+ - t5520: improve test style
751
+ - t: teach test_cmp_rev to accept ! for not-equals
752
248
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
249
- - zlib.c: use size_t for size
753
+ Test cleanup.
754
251
- The wrapper to call into zlib followed our long tradition to use
252
- "unsigned long" for sizes of regions in memory, which have been
253
- updated to use "size_t".
755
+ Will merge to 'next'.
756
255
---------------------------------------------------
256
-[Cooking]
757
258
-* js/builtin-add-i (2019-11-08) 9 commits
758
+* 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)
@@ -265,26 +765,31 @@ of the repositories listed at
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`
768
+ (this branch is used by js/builtin-add-i-cmds.)
769
770
The beginning of rewriting "git add -i" in C.
771
772
+ Will merge to 'next'.
773
+
774
775
* es/myfirstcontrib-updates (2019-11-02) 3 commits
273
- - myfirstcontrib: hint to find gitgitgadget allower
274
- - myfirstcontrib: add dependency installation step
275
- - myfirstcontrib: add 'psuh' to command-list.txt
776
+ (merged to 'next' on 2019-11-19 at 41d70e1db4)
777
+ + myfirstcontrib: hint to find gitgitgadget allower
778
+ + myfirstcontrib: add dependency installation step
779
+ + myfirstcontrib: add 'psuh' to command-list.txt
780
781
Doc updates.
782
279
- Will merge to 'next'.
783
+ Will merge to 'master'.
784
785
786
* rt/fetch-message-fix (2019-11-02) 1 commit
283
- - fetch.c: fix typo in a warning message
787
+ (merged to 'next' on 2019-11-19 at 69eb337cd8)
788
+ + fetch.c: fix typo in a warning message
789
790
A small message update.
791
287
- Will merge to 'next'.
792
+ Will merge to 'master'.
793
794
795
* ra/rebase-i-more-options (2019-11-02) 6 commits
@@ -299,72 +804,31 @@ of the repositories listed at
804
rebase" proper.
805
806
302
-* en/doc-typofix (2019-11-07) 11 commits
303
- - Fix spelling errors in no-longer-updated-from-upstream modules
304
- - multimail: fix a few simple spelling errors
305
- - sha1dc: fix trivial comment spelling error
306
- - Fix spelling errors in test commands
307
- - Fix spelling errors in messages shown to users
308
- - Fix spelling errors in names of tests
309
- - Fix spelling errors in comments of testcases
310
- - Fix spelling errors in code comments
311
- - Prefer 'up-to-date' spelling
312
- - Fix spelling errors in documentation outside of Documentation/
313
- - Documentation: fix a bunch of typos, both old and new
314
-
315
- Docfix.
316
-
317
- Will merge to 'next'.
318
-
319
-
320
-* hw/remove-api-docs-placeholder (2019-10-25) 1 commit
321
- (merged to 'next' on 2019-10-30 at c99fe16682)
322
- + documentation: remove empty doc files
807
+* en/doc-typofix (2019-11-10) 10 commits
808
+ (merged to 'next' on 2019-11-19 at e7bfe50de5)
809
+ + Fix spelling errors in no-longer-updated-from-upstream modules
810
+ + multimail: fix a few simple spelling errors
811
+ + sha1dc: fix trivial comment spelling error
812
+ + Fix spelling errors in test commands
813
+ + Fix spelling errors in messages shown to users
814
+ + Fix spelling errors in names of tests
815
+ + Fix spelling errors in comments of testcases
816
+ + Fix spelling errors in code comments
817
+ + Fix spelling errors in documentation outside of Documentation/
818
+ + Documentation: fix a bunch of typos, both old and new
819
820
Docfix.
821
822
Will merge to 'master'.
823
824
329
-* js/update-index-ignore-removal-for-skip-worktree (2019-11-02) 2 commits
330
- (merged to 'next' on 2019-11-02 at 57f7fb885f)
331
- + stash: handle staged changes in skip-worktree files correctly
332
- + update-index: optionally leave skip-worktree entries alone
333
-
334
- "git stash save" in a working tree that is sparsely checked out
335
- mistakenly removed paths that are outside the area of interest.
336
-
337
- Will merge to 'master'.
338
-
339
-
340
-* pb/pretty-email-without-domain-part (2019-10-30) 3 commits
341
- (merged to 'next' on 2019-10-30 at 06f719efa5)
342
- + pretty: add "%aL" etc. to show local-part of email addresses
343
- + t4203: use test-lib.sh definitions
344
- + t6006: use test-lib.sh definitions
345
-
346
- The custom format for "git log --format=<format>" learned the l/L
347
- placeholder that is similar to e/E that fills in the e-mail
348
- address, but only the local part on the left side of '@'.
349
-
350
- Will merge to 'master'.
351
-
352
-
353
-* sg/commit-graph-usage-fix (2019-10-28) 1 commit
354
- (merged to 'next' on 2019-10-28 at 13d01506dd)
355
- + builtin/commit-graph.c: remove subcommand-less usage string
356
-
357
- Message fix.
358
-
359
- Will merge to 'master'.
360
-
361
-
825
* dl/doc-diff-no-index-implies-exit-code (2019-11-02) 1 commit
363
- - git-diff.txt: document return code of `--no-index`
826
+ (merged to 'next' on 2019-11-19 at e2b2181e28)
827
+ + git-diff.txt: document return code of `--no-index`
828
829
Doc update.
830
367
- Will merge to 'next'.
831
+ Will merge to 'master'.
832
833
834
* dl/submodule-set-url (2019-10-30) 1 commit
@@ -374,70 +838,66 @@ of the repositories listed at
838
839
840
* js/vreportf-wo-buffering (2019-11-02) 1 commit
377
- - vreportf(): avoid relying on stdio buffering
841
+ (merged to 'next' on 2019-11-19 at cae61b9899)
842
+ + vreportf(): avoid relying on stdio buffering
843
844
Messages from die() etc. can be mixed up from multiple processes
845
without even line buffering on Windows, which has been worked
846
around.
847
383
- Will merge to 'next'.
848
+ Will merge to 'master'.
849
850
851
* ma/bisect-doc-sample-update (2019-10-29) 1 commit
387
- - Documentation/git-bisect.txt: add --no-ff to merge command
852
+ (merged to 'next' on 2019-11-19 at bde6adce1b)
853
+ + Documentation/git-bisect.txt: add --no-ff to merge command
854
855
"git merge --no-commit" needs "--no-ff" if you do not want to move
856
HEAD, which has been corrected in the manual page for "git bisect".
857
392
- Will merge to 'next'.
858
+ Will merge to 'master'.
859
860
861
* mr/clone-dir-exists-to-path-exists (2019-10-29) 1 commit
396
- - clone: rename static function `dir_exists()`.
862
+ (merged to 'next' on 2019-11-19 at 07b6ab25de)
863
+ + clone: rename static function `dir_exists()`.
864
865
Code cleanup.
866
400
- Will merge to 'next'.
867
+ Will merge to 'master'.
868
869
870
* pb/help-list-gitsubmodules-among-guides (2019-10-29) 1 commit
404
- - help: add gitsubmodules to the list of guides
871
+ (merged to 'next' on 2019-11-19 at 3c6f5c1901)
872
+ + help: add gitsubmodules to the list of guides
873
874
Help update.
875
408
- Will merge to 'next'.
876
+ Will merge to 'master'.
877
878
879
* pb/no-recursive-reset-hard-in-worktree-add (2019-10-30) 1 commit
412
- - worktree: teach "add" to ignore submodule.recurse config
880
+ (merged to 'next' on 2019-11-19 at cdfb0643e9)
881
+ + worktree: teach "add" to ignore submodule.recurse config
882
883
"git worktree add" internally calls "reset --hard" that should not
884
descend into submodules, even when submodule.recurse configuration
885
is set, but it was affected. This has been correct.
886
418
- Will merge to 'next'.
887
+ Will merge to 'master'.
888
889
890
* sg/blame-indent-heuristics-is-now-the-default (2019-10-29) 1 commit
422
- - builtin/blame.c: remove '--indent-heuristic' from usage string
891
+ (merged to 'next' on 2019-11-19 at 68e60f08cc)
892
+ + builtin/blame.c: remove '--indent-heuristic' from usage string
893
894
Message update.
895
426
- Will merge to 'next'.
427
-
428
-
429
-* hv/bitshift-constants-in-blame (2019-10-21) 1 commit
430
- (merged to 'next' on 2019-10-24 at bc84aae4d4)
431
- + builtin/blame.c: constants into bit shift format
432
-
433
- Move the definition of a set of bitmask constants from 0ctal
434
- literal to (1U<<count) notation.
435
-
896
Will merge to 'master'.
897
898
899
* jk/cleanup-object-parsing-and-fsck (2019-10-28) 23 commits
440
- (merged to 'next' on 2019-10-30 at 6e8b84557e)
900
+ (merged to 'next' on 2019-11-10 at 50b2267a2a)
901
+ fsck: accept an oid instead of a "struct tree" for fsck_tree()
902
+ fsck: accept an oid instead of a "struct commit" for fsck_commit()
903
+ fsck: accept an oid instead of a "struct tag" for fsck_tag()
@@ -462,20 +922,12 @@ of the repositories listed at
922
+ parse_commit_buffer(): treat lookup_tree() failure as parse error
923
+ parse_commit_buffer(): treat lookup_commit() failure as parse error
924
925
+ Originally merged to 'next' on 2019-10-30
926
+
927
Crufty code and logic accumulated over time around the object
928
parsing and low-level object access used in "git fsck" have been
929
cleaned up.
930
469
- Will cook in 'next'.
470
-
471
-
472
-* js/rebase-deprecate-preserve-merges (2019-10-21) 1 commit
473
- (merged to 'next' on 2019-10-24 at 82fa49bbf2)
474
- + rebase: hide --preserve-merges option
475
-
476
- "git rebase --preserve-merges" has been marked as deprecated; this
477
- release stops advertising it in the "git rebase -h" output.
478
-
931
Will merge to 'master'.
932
933
@@ -487,95 +939,20 @@ of the repositories listed at
939
Expecting a reroll.
940
941
490
-* jc/am-show-current-patch-docfix (2019-10-23) 1 commit
491
- (merged to 'next' on 2019-10-24 at 31fa6081f2)
492
- + doc: am --show-current-patch gives an entire e-mail message
493
-
494
- Doc update.
495
-
496
- Will merge to 'master'.
497
-
498
-
499
-* js/advise-rebase-skip (2019-10-23) 3 commits
500
- (merged to 'next' on 2019-10-24 at e2edd2df2d)
501
- + commit: give correct advice for empty commit during a rebase
502
- + sequencer: export the function to get the path of `.git/rebase-merge/`
503
- + cherry-pick: add test for `--skip` advice in `git commit`
504
-
505
- The logic used in "git commit" to give hints and errors depending
506
- on what operation was in progress learned to distinguish rebase and
507
- cherry-pick better.
508
-
509
- Perhaps discard and expect a reroll.
510
- cf. <9d550cd9-08a2-eee5-7d7f-63678285accc@gmail.com>
511
-
512
-
513
-* sg/dir-trie-fixes (2019-10-23) 5 commits
514
- (merged to 'next' on 2019-10-24 at 06d60a7fb0)
515
- + path.c: don't call the match function without value in trie_find()
516
- + path.c: clarify two field names in 'struct common_dir'
517
- + path.c: mark 'logs/HEAD' in 'common_list' as file
518
- + path.c: clarify trie_find()'s in-code comment
519
- + Documentation: mention more worktree-specific exceptions
520
-
521
- Code clean-up and a bugfix in the logic used to tell worktree local
522
- and repository global refs apart.
523
-
524
- Will merge to 'master'.
525
-
526
-
527
-* wb/midx-progress (2019-10-23) 6 commits
528
- (merged to 'next' on 2019-10-24 at 95c3e3ab3a)
529
- + multi-pack-index: add [--[no-]progress] option.
530
- + midx: honor the MIDX_PROGRESS flag in midx_repack
531
- + midx: honor the MIDX_PROGRESS flag in verify_midx_file
532
- + midx: add progress to expire_midx_packs
533
- + midx: add progress to write_midx_file
534
- + midx: add MIDX_PROGRESS flag
535
-
536
- The code to generate multi-pack index learned to show (or not to
537
- show) progress indicators.
538
-
539
- Will merge to 'master'.
540
-
541
-
542
-* dl/apply-3way-diff3 (2019-10-24) 5 commits
543
- (merged to 'next' on 2019-10-24 at 84e27d28b6)
544
- + apply: respect merge.conflictStyle in --3way
545
- + t4108: demonstrate bug in apply
546
- + t4108: use `test_config` instead of `git config`
547
- + t4108: remove git command upstream of pipe
548
- + t4108: replace create_file with test_write_lines
549
-
550
- "git apply --3way" learned to honor merge.conflictStyle
551
- configuration variable, like merges would.
552
-
553
- Will merge to 'master'.
554
-
555
-
942
* hw/config-doc-in-header (2019-10-24) 1 commit
557
- - config: move documentation to config.h
943
+ (merged to 'next' on 2019-11-19 at 7f314c649e)
944
+ + config: move documentation to config.h
945
946
Follow recent push to move API docs from Documentation/ to header
947
files and update config.h
948
562
- Will merge to 'next'.
563
-
564
-
565
-* dd/notes-copy-default-dst-to-head (2019-10-18) 2 commits
566
- (merged to 'next' on 2019-10-18 at 2588a175ec)
567
- + notes: fix minimum number of parameters to "copy" subcommand
568
- + t3301: test diagnose messages for too few/many paramters
569
-
570
- "git notes copy $original" ought to copy the notes attached to the
571
- original object to HEAD, but a mistaken tightening to command line
572
- parameter validation made earlier disabled that feature by mistake.
573
-
949
Will merge to 'master'.
950
951
577
-* jc/log-graph-simplify (2019-10-16) 13 commits
578
- (merged to 'next' on 2019-10-24 at 190b88709e)
952
+* jc/log-graph-simplify (2019-11-13) 14 commits
953
+ (merged to 'next' on 2019-11-19 at de6360c648)
954
+ + t4215: use helper function to check output
955
+ (merged to 'next' on 2019-11-10 at 79d2b8ff98)
956
+ graph: fix coloring of octopus dashes
957
+ graph: flatten edges that fuse with their right neighbor
958
+ graph: smooth appearance of collapsing edges on commit lines
@@ -593,142 +970,59 @@ of the repositories listed at
970
The implementation of "git log --graph" got refactored and then its
971
output got simplified.
972
596
- Will cook in 'next'.
973
+ Will merge to 'master'.
974
975
976
* js/git-path-head-dot-lock-fix (2019-10-29) 2 commits
600
- - git_path(): handle `.lock` files correctly
601
- - t1400: wrap setup code in test case
977
+ (merged to 'next' on 2019-11-19 at b406944979)
978
+ + git_path(): handle `.lock` files correctly
979
+ + t1400: wrap setup code in test case
980
981
"git rev-parse --git-path HEAD.lock" did not give the right path
982
when run in a secondary worktree.
983
606
- Will merge to 'next'.
607
-
608
-
609
-* pw/post-commit-from-sequencer (2019-10-16) 6 commits
610
- (merged to 'next' on 2019-10-18 at 15b41a097d)
611
- + sequencer: run post-commit hook
612
- + move run_commit_hook() to libgit and use it there
613
- + sequencer.h fix placement of #endif
614
- + t3404: remove uneeded calls to set_fake_editor
615
- + t3404: set $EDITOR in subshell
616
- + t3404: remove unnecessary subshell
617
-
618
- "rebase -i" ceased to run post-commit hook by mistake in an earlier
619
- update, which has been corrected.
620
-
984
Will merge to 'master'.
985
986
987
* ds/sparse-cone (2019-10-23) 17 commits
625
- - sparse-checkout: cone mode should not interact with .gitignore
626
- - sparse-checkout: write using lockfile
627
- - sparse-checkout: update working directory in-process
628
- - sparse-checkout: sanitize for nested folders
629
- - read-tree: show progress by default
630
- - unpack-trees: add progress to clear_ce_flags()
631
- - unpack-trees: hash less in cone mode
632
- - sparse-checkout: init and set in cone mode
633
- - sparse-checkout: use hashmaps for cone patterns
634
- - sparse-checkout: add 'cone' mode
635
- - trace2: add region in clear_ce_flags
636
- - sparse-checkout: create 'disable' subcommand
637
- - sparse-checkout: add '--stdin' option to set subcommand
638
- - sparse-checkout: 'set' subcommand
639
- - clone: add --sparse mode
640
- - sparse-checkout: create 'init' subcommand
641
- - sparse-checkout: create builtin with 'list' subcommand
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
646
- Will merge to 'next'.
647
-
648
-
649
-* dl/format-patch-cover-from-desc (2019-10-16) 3 commits
650
- (merged to 'next' on 2019-10-18 at 40e992b6f5)
651
- + format-patch: teach --cover-from-description option
652
- + format-patch: use enum variables
653
- + format-patch: replace erroneous and condition
654
-
655
- The branch description ("git branch --edit-description") has been
656
- used to fill the body of the cover letters by the format-patch
657
- command; this has been enhanced so that the subject can also be
658
- filled.
659
-
660
- Will merge to 'master'.
661
-
662
-
663
-* en/merge-recursive-directory-rename-fixes (2019-10-23) 3 commits
664
- (merged to 'next' on 2019-10-24 at 82e64029a8)
665
- + t604[236]: do not run setup in separate tests
666
- + merge-recursive: fix merging a subdirectory into the root directory
667
- + merge-recursive: clean up get_renamed_dir_portion()
668
-
669
- When all files from some subdirectory were renamed to the root
670
- directory, the directory rename heuristics would fail to detect that
671
- as a rename/merge of the subdirectory to the root directory, which has
672
- been corrected.
673
-
674
- Will merge to 'master'.
675
-
676
-
677
-* jt/fetch-pack-record-refs-in-the-dot-promisor (2019-10-16) 1 commit
678
- (merged to 'next' on 2019-10-18 at 4ead52e59a)
679
- + fetch-pack: write fetched refs to .promisor
680
-
681
- Debugging support for lazy cloning has been a bit improved.
682
-
683
- Will merge to 'master'.
684
-
685
-
686
-* es/walken-tutorial (2019-10-12) 1 commit
687
- (merged to 'next' on 2019-10-18 at 59160e59e9)
688
- + documentation: add tutorial for object walking
689
-
690
- A tutorial on object enumeration.
691
-
692
- Will merge to 'master'.
693
-
694
-
695
-* bc/hash-independent-tests-part-6 (2019-10-28) 15 commits
696
- (merged to 'next' on 2019-10-30 at 70037a3839)
697
- + t4048: abstract away SHA-1-specific constants
698
- + t4045: make hash-size independent
699
- + t4044: update test to work with SHA-256
700
- + t4039: abstract away SHA-1-specific constants
701
- + t4038: abstract away SHA-1 specific constants
702
- + t4034: abstract away SHA-1-specific constants
703
- + t4027: make hash-size independent
704
- + t4015: abstract away SHA-1-specific constants
705
- + t4011: abstract away SHA-1-specific constants
706
- + t4010: abstract away SHA-1-specific constants
707
- + t3429: remove SHA1 annotation
708
- + t1305: avoid comparing extensions
709
- + rev-parse: add a --show-object-format option
710
- + t/oid-info: add empty tree and empty blob values
711
- + t/oid-info: allow looking up hash algorithm name
712
-
713
- Test updates to prepare for SHA-2 transition continues.
714
-
1010
Will merge to 'master'.
1011
1012
1013
* ag/sequencer-todo-updates (2019-10-28) 6 commits
719
- (merged to 'next' on 2019-10-28 at 85f694d9d3)
720
- + SQUASH??? tentative leakfix
721
- (merged to 'next' on 2019-10-18 at 8dac803e49)
722
- + sequencer: directly call pick_commits() from complete_action()
723
- + rebase: fill `squash_onto' in get_replay_opts()
724
- + sequencer: move the code writing total_nr on the disk to a new function
725
- + sequencer: update `done_nr' when skipping commands in a todo list
726
- + sequencer: update `total_nr' when adding an item to a todo list
1014
+ - SQUASH??? tentative leakfix
1015
+ - sequencer: directly call pick_commits() from complete_action()
1016
+ - rebase: fill `squash_onto' in get_replay_opts()
1017
+ - sequencer: move the code writing total_nr on the disk to a new function
1018
+ - sequencer: update `done_nr' when skipping commands in a todo list
1019
+ - sequencer: update `total_nr' when adding an item to a todo list
1020
1021
Reduce unnecessary reading of state variables back from the disk
1022
during sequener operation.
1023
731
- Kick back to 'pu' before squashing the leakfix.
1024
+ Is the leakfix patch at the tip the only thing that needs to
1025
+ prepare the topic ready for 'next'?
1026
1027
1028
* mt/threaded-grep-in-object-store (2019-10-02) 11 commits
@@ -748,21 +1042,23 @@ of the repositories listed at
1042
(as opposed to files in the working tree) as accesses to the object
1043
layer is not thread-safe. This limitation is getting lifted.
1044
751
- What's the current status of this one?
1045
+ Expecting a reroll.
1046
+ cf. <CAHd-oW7UPSSExyLtfLMCObWogKrBOctYabrFrOdf9-4Q2PZmMg@mail.gmail.com>
1047
1048
1049
* jk/packfile-reuse-cleanup (2019-10-23) 9 commits
755
- - pack-objects: improve partial packfile reuse
756
- - builtin/pack-objects: introduce obj_is_packed()
757
- - pack-objects: introduce pack.allowPackReuse
758
- - csum-file: introduce hashfile_total()
759
- - pack-bitmap: introduce bitmap_walk_contains()
760
- - pack-bitmap: don't rely on bitmap_git->reuse_objects
761
- - ewah/bitmap: introduce bitmap_word_alloc()
1050
+ (merged to 'next' on 2019-11-19 at 9683853939)
1051
+ + pack-objects: improve partial packfile reuse
1052
+ + builtin/pack-objects: introduce obj_is_packed()
1053
+ + pack-objects: introduce pack.allowPackReuse
1054
+ + csum-file: introduce hashfile_total()
1055
+ + pack-bitmap: introduce bitmap_walk_contains()
1056
+ + pack-bitmap: don't rely on bitmap_git->reuse_objects
1057
+ + ewah/bitmap: introduce bitmap_word_alloc()
1058
+ packfile: expose get_delta_base()
1059
+ builtin/pack-objects: report reused packfile objects
1060
1061
The way "git pack-objects" reuses objects stored in existing pack
1062
to generate its result has been improved.
1063
768
- Will merge to 'next'.
1064
+ Will merge to 'master'.