What's cooking (2019/06 #03)
Junio C Hamano committed
Jun 12, 2019 at 15:17 UTC
f0bab95d47a569cf603bb46a0c903abe52be8002
1 file changed
+226
-154
whats-cooking.txt
+226
-154
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2019, #02; Thu, 6)
4
-X-master-at: 74583d89127e21255c12dd3c8a3bf60b497d7d03
5
-X-next-at: ee3066bb6536c68f973b3c0ffaaa13f4bfda5ea3
3
+Subject: What's cooking in git.git (Jun 2019, #03; Wed, 12)
4
+X-master-at: b697d92f56511e804b8ba20ccbe7bdc85dc66810
5
+X-next-at: 95628af9bbb1414c85a80e992c77d3eb4efd24a4
6
7
-What's cooking in git.git (Jun 2019, #02; Thu, 6)
7
+What's cooking in git.git (Jun 2019, #03; Wed, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,7 @@ 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
-On top of -rc3, the tip of 'master' will have a fix for a
16
-corner-case regression in the merge-recursive machinery introduced
17
-during this cycle before the final.
15
+Git 2.22 final has been tagged.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -22,7 +20,7 @@ of the repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
25
-[New Topics]
23
+[Graduated to "master"]
24
25
* en/merge-directory-renames-fix (2019-06-05) 1 commit
26
(merged to 'next' on 2019-06-06 at fd59bad9d7)
@@ -31,84 +29,88 @@ of the repositories listed at
29
Recent code restructuring of merge-recursive engine introduced a
30
regression dealing with rename/add conflict.
31
34
- Will merge to 'master'.
35
-
32
+--------------------------------------------------
33
+[New Topics]
34
37
-* fc/fetch-with-import-fix (2019-06-04) 5 commits
38
- - fetch: fix regression with transport helpers
39
- - fetch: make the code more understandable
40
- - fetch: trivial cleanup
41
- - t5801 (remote-helpers): add test to fetch tags
42
- - t5801 (remote-helpers): cleanup refspec stuff
35
+* mo/hpux-dynpath (2019-06-07) 1 commit
36
+ - configure: Detect linking style for HP aCC on HP-UX
37
44
- Code restructuring during 2.20 period broke fetching tags via
45
- "import" based transports.
38
+ Auto-detect how to tell HP-UX aCC where to use dynamicallly linked
39
+ libraries from at runtime.
40
41
Will merge to 'next'.
42
43
50
-* jl/status-reduce-vertical-blank (2019-06-04) 1 commit
51
- - status: remove the empty line after hints
52
- (this branch uses nd/switch-and-restore.)
44
+* js/mergetool-optim (2019-06-12) 4 commits
45
+ - mergetool: use shell variable magic instead of `awk`
46
+ - mergetool: dissect strings with shell variable magic instead of `expr`
47
+ - t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
48
+ - t7610-mergetool: do not place pipelines headed by `yes` in subshells
49
54
- Extra blank lines in "git status" output have been reduced.
50
+ "git mergetool" and its tests now spawn fewer subprocesses.
51
56
- Needs to wait on nd/switch-and-restore to stabilize.
52
+ Will merge to 'next'.
53
54
59
-* md/url-parse-harden (2019-06-04) 2 commits
60
- (merged to 'next' on 2019-06-06 at b187c3dbfe)
61
- + url: do not allow %00 to represent NUL in URLs
62
- + url: do not read past end of buffer
55
+* cc/test-oidmap (2019-06-11) 4 commits
56
+ - oidmap: use sha1hash() instead of static hash() function
57
+ - SQUASH??? sh style
58
+ - t: add t0016-oidmap.sh
59
+ - t/helper: add test-oidmap.c
60
64
- The URL decoding code has been updated to avoid going past the end
65
- of the string while parsing %-<hex>-<hex> sequence.
61
67
- Will cook in 'next'.
62
+* ds/midx-expire-repack (2019-06-11) 11 commits
63
+ - t5319-multi-pack-index.sh: test batch size zero
64
+ - midx: add test that 'expire' respects .keep files
65
+ - multi-pack-index: test expire while adding packs
66
+ - midx: implement midx_repack()
67
+ - multi-pack-index: prepare 'repack' subcommand
68
+ - multi-pack-index: implement 'expire' subcommand
69
+ - midx: refactor permutation logic and pack sorting
70
+ - midx: simplify computation of pack name lengths
71
+ - multi-pack-index: prepare for 'expire' subcommand
72
+ - Docs: rearrange subcommands for multi-pack-index
73
+ - repack: refactor pack deletion for future use
74
75
+ "git multi-pack-index" learned expire and repack subcommands.
76
70
-* mo/clang-format-for-each-update (2019-06-04) 1 commit
71
- (merged to 'next' on 2019-06-06 at ee3066bb65)
72
- + clang-format: use git grep to generate the ForEachMacros list
77
+ Will merge to 'next'.
78
74
- The list of for-each like macros used by clang-format has been
75
- updated.
79
77
- Will cook in 'next'.
80
+* md/sort-detached-head-first (2019-06-11) 1 commit
81
+ - ref-filter: sort detached HEAD lines firstly
82
83
+ "git branch --list" learned to always output the detached HEAD as
84
+ the first item (when the HEAD is detached, of course), instead of
85
+ relying on the textual order of sorting
86
80
-* dl/config-alias-doc (2019-06-06) 2 commits
81
- - config/alias.txt: document alias accepting non-command first word
82
- - config/alias.txt: change " and ' to `
87
88
+* nd/completion-no-cache-failure (2019-06-12) 1 commit
89
+ - completion: do not cache if --git-completion-helper fails
90
85
-* dl/includeif-onbranch (2019-06-05) 1 commit
86
- - config: learn the "onbranch:" includeIf condition
91
+ An incorrect list of options was cached after command line
92
+ completion failed (e.g. trying to complete a command that requires
93
+ a repository outside one), which has been corrected.
94
95
+ Will merge to 'next'.
96
89
-* ds/commit-graph-incremental (2019-06-06) 15 commits
90
- - SQUASH??? 5323 is already taken
91
- - commit-graph: clean up chains after flattened write
92
- - commit-graph: verify chains with --shallow mode
93
- - commit-graph: create options for split files
94
- - commit-graph: expire commit-graph files
95
- - commit-graph: allow cross-alternate chains
96
- - commit-graph: merge commit-graph chains
97
- - commit-graph: add --split option to builtin
98
- - commit-graph: write commit-graph chains
99
- - commit-graph: rearrange chunk count logic
100
- - commit-graph: add base graphs chunk
101
- - commit-graph: load commit-graph chains
102
- - commit-graph: rename commit_compare to oid_compare
103
- - commit-graph: prepare for commit-graph chains
104
- - commit-graph: document commit-graph chains
105
- (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)
97
107
- Needs to wait on ds/commit-graph-write-refactor to stabilize.
98
+* sg/rebase-progress (2019-06-11) 4 commits
99
+ - progress: use term_clear_line()
100
+ - rebase: fix garbled progress display with '-x'
101
+ - pager: add a helper function to clear the last line in the terminal
102
+ - t3404-rebase-interactive: use the 'q_to_cr' helper
103
104
+ Use "Erase in Line" CSI sequence that is already used in the editor
105
+ support to clear cruft in the progress output.
106
110
-* tm/tag-gpgsign-config (2019-06-05) 1 commit
111
- - tag: add tag.gpgSign config option to force all tags be GPG-signed
107
+
108
+* sg/trace2-rename (2019-06-12) 1 commit
109
+ - Revert "test-lib: whitelist GIT_TR2_* in the environment"
110
+
111
+ Dev support update to help tracing out tests.
112
+
113
+ Will merge to 'next'.
114
115
--------------------------------------------------
116
[Stalled]
@@ -152,15 +154,6 @@ of the repositories listed at
154
Stalled
155
156
155
-* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
156
- - add -p: coalesce hunks before testing applicability
157
-
158
- Applicability check after a patch is edited in a "git add -i/p"
159
- session has been improved.
160
-
161
- Will drop as "add -i in C" topic seems to be getting ready to test.
162
-
163
-
157
* js/protocol-advertise-multi (2018-12-28) 1 commit
158
- protocol: advertise multiple supported versions
159
@@ -194,6 +187,102 @@ of the repositories listed at
187
--------------------------------------------------
188
[Cooking]
189
190
+* fc/fetch-with-import-fix (2019-06-04) 5 commits
191
+ - fetch: fix regression with transport helpers
192
+ - fetch: make the code more understandable
193
+ - fetch: trivial cleanup
194
+ - t5801 (remote-helpers): add test to fetch tags
195
+ - t5801 (remote-helpers): cleanup refspec stuff
196
+
197
+ Code restructuring during 2.20 period broke fetching tags via
198
+ "import" based transports.
199
+
200
+ Will merge to 'next'.
201
+
202
+
203
+* jl/status-reduce-vertical-blank (2019-06-04) 1 commit
204
+ - status: remove the empty line after hints
205
+ (this branch uses nd/switch-and-restore.)
206
+
207
+ Extra blank lines in "git status" output have been reduced.
208
+
209
+ Needs to wait on nd/switch-and-restore to stabilize.
210
+
211
+
212
+* md/url-parse-harden (2019-06-04) 2 commits
213
+ (merged to 'next' on 2019-06-06 at b187c3dbfe)
214
+ + url: do not allow %00 to represent NUL in URLs
215
+ + url: do not read past end of buffer
216
+
217
+ The URL decoding code has been updated to avoid going past the end
218
+ of the string while parsing %-<hex>-<hex> sequence.
219
+
220
+ Will merge to 'master'.
221
+
222
+
223
+* mo/clang-format-for-each-update (2019-06-04) 1 commit
224
+ (merged to 'next' on 2019-06-06 at ee3066bb65)
225
+ + clang-format: use git grep to generate the ForEachMacros list
226
+
227
+ The list of for-each like macros used by clang-format has been
228
+ updated.
229
+
230
+ Will merge to 'master'.
231
+
232
+
233
+* dl/config-alias-doc (2019-06-06) 2 commits
234
+ - config/alias.txt: document alias accepting non-command first word
235
+ - config/alias.txt: change " and ' to `
236
+
237
+ Doc update.
238
+
239
+ Will merge to 'next'.
240
+
241
+
242
+* dl/includeif-onbranch (2019-06-05) 1 commit
243
+ - config: learn the "onbranch:" includeIf condition
244
+
245
+ The conditional inclusion mechanism learned to base the choice on
246
+ the branch the HEAD currently is on.
247
+
248
+ Will merge to 'next'.
249
+
250
+
251
+* ds/commit-graph-incremental (2019-06-12) 16 commits
252
+ - commit-graph: test --split across alternate without --split
253
+ - commit-graph: test octopus merges with --split
254
+ - commit-graph: clean up chains after flattened write
255
+ - commit-graph: verify chains with --shallow mode
256
+ - commit-graph: create options for split files
257
+ - commit-graph: expire commit-graph files
258
+ - commit-graph: allow cross-alternate chains
259
+ - commit-graph: merge commit-graph chains
260
+ - commit-graph: add --split option to builtin
261
+ - commit-graph: write commit-graph chains
262
+ - commit-graph: rearrange chunk count logic
263
+ - commit-graph: add base graphs chunk
264
+ - commit-graph: load commit-graph chains
265
+ - commit-graph: rename commit_compare to oid_compare
266
+ - commit-graph: prepare for commit-graph chains
267
+ - commit-graph: document commit-graph chains
268
+ (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)
269
+
270
+ The commits in a repository can be described by multiple
271
+ commit-graph files now, which allows the commit-graph files to be
272
+ updated incrementally.
273
+
274
+ Will merge to 'next'.
275
+
276
+
277
+* tm/tag-gpgsign-config (2019-06-05) 1 commit
278
+ - tag: add tag.gpgSign config option to force all tags be GPG-signed
279
+
280
+ A new tag.gpgSign configuration variable turns "git tag -a" into
281
+ "git tag -s".
282
+
283
+ Will merge to 'next'.
284
+
285
+
286
* md/list-objects-filter-memfix (2019-05-31) 1 commit
287
(merged to 'next' on 2019-06-06 at 80f0187cef)
288
+ list-objects-filter: correct usage of ALLOC_GROW
@@ -203,7 +292,7 @@ of the repositories listed at
292
correctly---'nr' is supposed to point at one past the last element
293
of the array in use. This has been corrected.
294
206
- Will cook in 'next'.
295
+ Will merge to 'master'.
296
297
298
* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit
@@ -212,7 +301,7 @@ of the repositories listed at
301
302
Make an end-user facing message localizable.
303
215
- Will cook in 'next'.
304
+ Will merge to 'master'.
305
306
307
* cm/send-email-document-req-modules (2019-05-31) 1 commit
@@ -221,13 +310,15 @@ of the repositories listed at
310
311
A doc update.
312
224
- Will cook in 'next'.
313
+ Will merge to 'master'.
314
315
316
* po/doc-branch (2019-05-29) 1 commit
317
- doc branch: provide examples for listing remote tracking branches
318
230
- RFC
319
+ Doc update.
320
+
321
+ Will merge to 'next'.
322
323
324
* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
@@ -236,7 +327,7 @@ of the repositories listed at
327
328
Update to Unicode 12.1 width table.
329
239
- Will cook in 'next'.
330
+ Will merge to 'master'.
331
332
333
* ab/hash-object-doc (2019-05-28) 1 commit
@@ -245,7 +336,7 @@ of the repositories listed at
336
337
Doc update.
338
248
- Will cook in 'next'.
339
+ Will merge to 'master'.
340
341
342
* ds/object-info-for-prefetch-fix (2019-05-28) 1 commit
@@ -254,7 +345,7 @@ of the repositories listed at
345
346
Code cleanup and futureproof.
347
257
- Will cook in 'next'.
348
+ Will merge to 'master'.
349
350
351
* ds/topo-traversal-using-commit-graph (2019-05-28) 2 commits
@@ -265,7 +356,7 @@ of the repositories listed at
356
Prepare use of reachability index in topological walker that works
357
on a range (A..B).
358
268
- Will cook in 'next'.
359
+ Will merge to 'master'.
360
361
362
* es/git-debugger-doc (2019-05-28) 1 commit
@@ -274,7 +365,7 @@ of the repositories listed at
365
366
Doc update.
367
277
- Will cook in 'next'.
368
+ Will merge to 'master'.
369
370
371
* es/grep-require-name-when-needed (2019-05-28) 1 commit
@@ -283,7 +374,7 @@ of the repositories listed at
374
375
More parameter validation.
376
286
- Will cook in 'next'.
377
+ Will merge to 'master'.
378
379
380
* ew/server-info-remove-crufts (2019-05-28) 1 commit
@@ -293,7 +384,7 @@ of the repositories listed at
384
"git update-server-info" used to leave stale packfiles in its
385
output, which has been corrected.
386
296
- Will cook in 'next'.
387
+ Will merge to 'master'.
388
389
390
* jk/HEAD-symref-in-xfer-namespaces (2019-05-28) 1 commit
@@ -304,7 +395,7 @@ of the repositories listed at
395
value for the HEAD symbolic ref when the namespace feature is in
396
use, which has been corrected.
397
307
- Will cook in 'next'.
398
+ Will merge to 'master'.
399
400
401
* jk/am-i-resolved-fix (2019-05-28) 4 commits
@@ -317,7 +408,7 @@ of the repositories listed at
408
"git am -i --resolved" segfaulted after trying to see a commit as
409
if it were a tree, which has been corrected.
410
320
- Will cook in 'next'.
411
+ Will merge to 'master'.
412
413
414
* js/bisect-helper-check-get-oid-return-value (2019-05-28) 1 commit
@@ -326,7 +417,7 @@ of the repositories listed at
417
418
Code cleanup.
419
329
- Will cook in 'next'.
420
+ Will merge to 'master'.
421
422
423
* js/bundle-verify-require-object-store (2019-05-28) 1 commit
@@ -337,7 +428,7 @@ of the repositories listed at
428
the receiving repository, but the command did not check if we are
429
in a repository upfront, which has been corrected.
430
340
- Will cook in 'next'.
431
+ Will merge to 'master'.
432
433
434
* js/fsmonitor-unflake (2019-05-28) 2 commits
@@ -349,7 +440,7 @@ of the repositories listed at
440
the on-disk index file, breaking t7519 tests occasionally, which
441
has been corrected.
442
352
- Will cook in 'next'.
443
+ Will merge to 'master'.
444
445
446
* mm/p4-unshelve-windows-fix (2019-05-28) 1 commit
@@ -360,7 +451,7 @@ of the repositories listed at
451
"git p4" was not properly quoted to protect a caret and running a
452
broken command on Windows, which has been corrected.
453
363
- Will cook in 'next'.
454
+ Will merge to 'master'.
455
456
457
* pb/request-pull-verify-remote-ref (2019-05-28) 2 commits
@@ -372,7 +463,7 @@ of the repositories listed at
463
from in the local repository and in the published repository are
464
different.
465
375
- Will cook in 'next'.
466
+ Will merge to 'master'.
467
468
469
* po/git-help-on-git-itself (2019-05-16) 2 commits
@@ -383,7 +474,7 @@ of the repositories listed at
474
"git help git" was hard to discover (well, at least for some
475
people).
476
386
- Will cook in 'next'.
477
+ Will merge to 'master'.
478
479
480
* sw/git-p4-unshelve-branched-files (2019-05-28) 1 commit
@@ -392,7 +483,7 @@ of the repositories listed at
483
484
"git p4" update.
485
395
- Will cook in 'next'.
486
+ Will merge to 'master'.
487
488
489
* vv/merge-squash-with-explicit-commit (2019-05-28) 1 commit
@@ -404,7 +495,7 @@ of the repositories listed at
495
by adding the "--commit" option; the command now refuses to work
496
when both options are given.
497
407
- Will cook in 'next'.
498
+ Will merge to 'master'.
499
500
501
* xl/record-partial-clone-origin (2019-05-29) 1 commit
@@ -416,7 +507,7 @@ of the repositories listed at
507
hardcoded name "origin" to name that remote; it has been corrected
508
to honor the "--origin <name>" option.
509
419
- Will cook in 'next'.
510
+ Will merge to 'master'.
511
512
513
* ab/fail-prereqs-in-test (2019-05-14) 1 commit
@@ -427,7 +518,7 @@ of the repositories listed at
518
ensure that the remainer of the tests still succeeds when tests
519
with prerequisites are skipped.
520
430
- Will cook in 'next'.
521
+ Will merge to 'master'.
522
523
524
* jk/help-unknown-ref-fix (2019-05-15) 2 commits
@@ -438,7 +529,7 @@ of the repositories listed at
529
Improve the code to show args with potential typo that cannot be
530
interpreted as a commit-ish.
531
441
- Will cook in 'next'.
532
+ Will merge to 'master'.
533
534
535
* js/rebase-cleanup (2019-05-15) 5 commits
@@ -452,10 +543,13 @@ of the repositories listed at
543
Update supporting parts of "git rebase" to remove code that should
544
no longer be used.
545
455
- Will cook in 'next'.
546
+ Will merge to 'master'.
547
548
458
-* jt/partial-clone-missing-ref-delta-base (2019-05-15) 2 commits
549
+* jt/partial-clone-missing-ref-delta-base (2019-06-11) 4 commits
550
+ (merged to 'next' on 2019-06-12 at 95628af9bb)
551
+ + t5616: cover case of client having delta base
552
+ + t5616: use correct flag to check object is missing
553
(merged to 'next' on 2019-05-29 at 5d7573a151)
554
+ index-pack: prefetch missing REF_DELTA bases
555
+ t5616: refactor packfile replacement
@@ -464,7 +558,7 @@ of the repositories listed at
558
necessary to complete delta in a thin packfile, which has been
559
corrected.
560
467
- Will cook in 'next'.
561
+ Will merge to 'master'.
562
563
564
* bl/userdiff-octave (2019-05-29) 2 commits
@@ -477,7 +571,7 @@ of the repositories listed at
571
boundary for Matlab has been extend to cover Octave, which is more
572
or less equivalent.
573
480
- Will cook in 'next'.
574
+ Will merge to 'master'.
575
576
577
* ew/update-server-info (2019-05-15) 1 commit
@@ -487,7 +581,7 @@ of the repositories listed at
581
"git update-server-info" learned not to rewrite the file with the
582
same contents.
583
490
- Will cook in 'next'.
584
+ Will merge to 'master'.
585
586
587
* nd/corrupt-worktrees (2019-05-15) 1 commit
@@ -497,7 +591,7 @@ of the repositories listed at
591
"git worktree add" used to fail when another worktree connected to
592
the same repository was corrupt, which has been corrected.
593
500
- Will cook in 'next'.
594
+ Will merge to 'master'.
595
596
597
* mh/import-transport-fd-fix (2019-05-16) 2 commits
@@ -509,7 +603,7 @@ of the repositories listed at
603
backend was mixed up, leading to unrelated file descriptor getting
604
closed, which has been fixed.
605
512
- Will cook in 'next'.
606
+ Will merge to 'master'.
607
608
609
* ab/deprecate-R-for-dynpath (2019-05-19) 1 commit
@@ -522,7 +616,7 @@ of the repositories listed at
616
which is the more recent GCC uses. Those who need to build with an
617
old GCC can still use "CC_LD_DYNPATH=-R"
618
525
- Will cook in 'next'.
619
+ Will merge to 'master'.
620
621
622
* ba/clone-remote-submodules (2019-05-28) 1 commit
@@ -535,10 +629,10 @@ of the repositories listed at
629
remote-tracking branches from the get-go, by passing the new
630
"--remote-submodules" option.
631
538
- Will cook in 'next'.
632
+ Will merge to 'master'.
633
634
541
-* ds/close-object-store (2019-05-28) 3 commits
635
+* ds/close-object-store (2019-06-12) 3 commits
636
- packfile: rename close_all_packs to close_object_store
637
- packfile: close commit-graph in close_all_packs
638
- commit-graph: use raw_object_store when closing
@@ -550,18 +644,19 @@ of the repositories listed at
644
an existing commit-graph file now is closed before "gc" finalizes a
645
new instance to replace it.
646
553
- Waiting on ds/commit-graph-write-refactor to stabilize.
647
+ Will merge to 'next'.
648
649
650
* ml/userdiff-rust (2019-05-30) 2 commits
557
- - userdiff: two simplifications of patterns for rust
651
+ (merged to 'next' on 2019-06-12 at 33b88fa9e5)
652
+ + userdiff: two simplifications of patterns for rust
653
(merged to 'next' on 2019-05-19 at 1266fddce5)
654
+ userdiff: add built-in pattern for rust
655
656
The pattern "git diff/grep" use to extract funcname and words
657
boundary for Rust has been added.
658
564
- Will cook in 'next'.
659
+ Will merge to 'master'.
660
661
662
* pw/rebase-edit-message-for-replayed-merge (2019-05-19) 1 commit
@@ -574,7 +669,7 @@ of the repositories listed at
669
one (i.e. fast-forward instead), but did not. Which has been
670
corrected.
671
577
- Will cook in 'next'.
672
+ Will merge to 'master'.
673
674
675
* sb/format-patch-base-patch-id-fix (2019-05-08) 2 commits
@@ -582,12 +677,11 @@ of the repositories listed at
677
+ format-patch: make --base patch-id output stable
678
+ format-patch: inform user that patch-id generation is unstable
679
585
- The recently added "--base" option of "format-patch" computed the
586
- patch-ids for prerequisite patches in an unstable way, which has
587
- been updated to compute in a way that is compatible with "git
588
- patch-id --stable".
680
+ The "--base" option of "format-patch" computed the patch-ids for
681
+ prerequisite patches in an unstable way, which has been updated to
682
+ compute in a way that is compatible with "git patch-id --stable".
683
590
- Will cook in 'next'.
684
+ Will merge to 'master'.
685
686
687
* ab/send-email-transferencoding-fix (2019-05-29) 7 commits
@@ -608,7 +702,7 @@ of the repositories listed at
702
(finally) redoing the order of setting the default, reading the
703
configuration and command line options.
704
611
- Will cook in 'next'.
705
+ Will merge to 'master'.
706
707
708
* dl/format-patch-notes-config (2019-05-17) 2 commits
@@ -619,7 +713,7 @@ of the repositories listed at
713
"git format-patch" learns a configuration to set the default for
714
its --notes=<ref> option.
715
622
- Will cook in 'next'.
716
+ Will merge to 'master'.
717
718
719
* jk/unused-params-final-batch (2019-05-13) 14 commits
@@ -642,7 +736,7 @@ of the repositories listed at
736
Remove many unused parameters throughout the codebase, with the
737
ultimate aim to allow us compile with -Wunused-parameter cleanly.
738
645
- Will cook in 'next'.
739
+ Will merge to 'master'.
740
741
742
* nd/init-relative-template-fix (2019-05-13) 1 commit
@@ -654,7 +748,7 @@ of the repositories listed at
748
but it instead was made relative to the repository, which has been
749
corrected.
750
657
- Will cook in 'next'.
751
+ Will merge to 'master'.
752
753
754
* an/ignore-doc-update (2019-06-04) 1 commit
@@ -665,7 +759,7 @@ of the repositories listed at
759
indicate things like "anchored to this level only" and "only
760
matches directories") has been revamped.
761
668
- Will cook in 'next'.
762
+ Will merge to 'master'.
763
764
765
* en/fast-export-encoding (2019-05-14) 5 commits
@@ -679,7 +773,7 @@ of the repositories listed at
773
The "git fast-export/import" pair has been taught to handle commits
774
with log messages in encoding other than UTF-8 better.
775
682
- Will cook in 'next'.
776
+ Will merge to 'master'.
777
778
779
* nd/merge-quit (2019-05-19) 2 commits
@@ -690,7 +784,7 @@ of the repositories listed at
784
"git merge" learned "--quit" option that cleans up the in-progress
785
merge while leaving the working tree and the index still in a mess.
786
693
- Will cook in 'next'.
787
+ Will merge to 'master'.
788
789
790
* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
@@ -729,7 +823,7 @@ of the repositories listed at
823
A new tutorial targetting specifically aspiring git-core
824
developers.
825
732
- Will cook in 'next'.
826
+ Will merge to 'master'.
827
828
829
* cc/multi-promisor (2019-04-15) 17 commits
@@ -755,8 +849,6 @@ of the repositories listed at
849
promisor remote and consult them in order when downloading missing
850
objects on demand.
851
758
- Needs review.
759
-
852
853
* nd/switch-and-restore (2019-05-07) 43 commits
854
- Declare both git-switch and git-restore experimental
@@ -810,6 +902,7 @@ of the repositories listed at
902
advancing the current history" out of the single "git checkout"
903
command.
904
905
+ Will merge to 'next'.
906
cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
907
cf. <20190425094600.15673-1-pclouds@gmail.com> (restore v3)
908
@@ -868,10 +961,10 @@ of the repositories listed at
961
must be a valid refname component. The code now sanitizes the names
962
given to worktrees, to make sure these refs are well-formed.
963
871
- Will cook in 'next'.
964
+ Will merge to 'master'.
965
966
874
-* ds/commit-graph-write-refactor (2019-05-13) 11 commits
967
+* ds/commit-graph-write-refactor (2019-06-12) 11 commits
968
- commit-graph: extract write_commit_graph_file()
969
- commit-graph: extract copy_oids_to_commits()
970
- commit-graph: extract count_distinct_commits()
@@ -887,15 +980,11 @@ of the repositories listed at
980
981
Renamed from commit-graph-format-v2 and changed scope.
982
890
- Expecting a reroll.
891
- I think it is almost there, modulo a few internal API details..
892
- cf. <pull.112.v4.git.gitgitgadget@gmail.com> (v4)
893
- cf. <17829620-1084-74e5-54ad-aa95990f4dbd@gmail.com>
983
+ Will merge to 'next'.
984
985
896
-* br/blame-ignore (2019-05-17) 10 commits
897
- - SQUASH??? test-lint -- seq not portable
898
- - SQUASH??? error: decl-after-stmt
986
+* br/blame-ignore (2019-06-10) 9 commits
987
+ - blame: add a test to cover blame_coalesce()
988
- blame: use the fingerprint heuristic to match ignored lines
989
- blame: add a fingerprint heuristic to match ignored lines
990
- blame: optionally track line fingerprints during fill_blame_origin()
@@ -908,30 +997,13 @@ of the repositories listed at
997
"git blame" learned to "ignore" commits in the history, whose
998
effects (as well as their presence) get ignored.
999
911
- cf. <20190515214503.77162-1-brho@google.com> (v7)
1000
+ cf. <20190610153014.42055-1-brho@google.com> (v8)
1001
1002
--------------------------------------------------
1003
[Discarded]
1004
916
-* nd/precious (2019-04-09) 1 commit
917
- . Introduce "precious" file concept
918
-
919
- "git clean" learned to pay attention to the 'precious' attributes
920
- and keep untracked paths with the attribute instead of removing
921
- when the "--keep-precious" is given.
922
-
923
- Retracted.
924
- cf. <CACsJy8AEZ-Lz6zgEsuNukvphB9TTa9FAC1gK05fhnie2xtfc9w@mail.gmail.com>
925
-
926
- I am not sure what aspect of this longer-term "precious" vision,
927
- which gets taught to various commands and use cases individually
928
- and incrementally, Ævar finds problematic, which I understand is
929
- the reason of redtraction.
930
-
931
-
932
-* jc/send-email-transferencoding-fix (2019-05-09) 2 commits
933
- . send-email: honor transferencoding config option again
934
- . send-email: update the mechanism to set default configuration values
1005
+* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
1006
+ . add -p: coalesce hunks before testing applicability
1007
936
- Replaced by Ævar's "do the default in the right order" approach.
937
- cf. <20190508105607.178244-1-gitster@pobox.com> (v2)
1008
+ Applicability check after a patch is edited in a "git add -i/p"
1009
+ session has been improved.