What's cooking (2018/05 #01)
Junio C Hamano committed
May 7, 2018 at 23:57 UTC
7ae8ee0ce5bbfb05da41068b83bfc3e32c8615d6
1 file changed
+379
-96
whats-cooking.txt
+379
-96
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2018, #04; Mon, 30)
3
+Subject: What's cooking in git.git (May 2018, #01; Mon, 7)
4
X-master-at: 1f1cddd558b54bb0ce19c8ace353fd07b758510d
5
-X-next-at: 4582c99ba8a159afafa295e51d1d3387967af0a0
5
+X-next-at: d54016d9e3a3ac00b0483d3779ff96f3882b7094
6
7
-What's cooking in git.git (Apr 2018, #04; Mon, 30)
7
+What's cooking in git.git (May 2018, #01; Mon, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,46 +20,328 @@ of the repositories listed at
20
--------------------------------------------------
21
[New Topics]
22
23
-* cc/perf-aggregate-unknown-option (2018-04-26) 1 commit
24
- - perf/aggregate: use Getopt::Long for option parsing
23
+* tb/test-apfs-utf8-normalization (2018-05-02) 1 commit
24
+ - test: correct detection of UTF8_NFD_TO_NFC for APFS
25
26
- Perf-test helper updates.
26
+ A test to see if the filesystem normalizes UTF-8 filename has been
27
+ updated to check what we need to know in a more direct way, i.e. a
28
+ path created in NFC form can be accessed with NFD form (or vice
29
+ versa) to cope with APFS as well as HFS.
30
31
Will merge to 'next'.
32
33
31
-* ab/perl-python-attrs (2018-04-27) 3 commits
32
- - .gitattributes: add a diff driver for Python
33
- - .gitattributes: use the "perl" differ for Perl
34
- - .gitattributes: add *.pl extension for Perl
34
+* ab/get-short-oid (2018-05-02) 12 commits
35
+ - get_short_oid: document & warn if we ignore the type selector
36
+ - config doc: document core.disambiguate
37
+ - get_short_oid / peel_onion: ^{commit} should be commit, not committish
38
+ - get_short_oid / peel_onion: ^{tree} should be tree, not treeish
39
+ - get_short_oid: learn to disambiguate by ^{blob}
40
+ - get_short_oid: learn to disambiguate by ^{tag}
41
+ - get_short_oid: sort ambiguous objects by type, then SHA-1
42
+ - sha1-name.c: move around the collect_ambiguous() function
43
+ - cache.h: add comment explaining the order in object_type
44
+ - git-p4: change "commitish" typo to "committish"
45
+ - sha1-array.h: align function arguments
46
+ - sha1-name.c: remove stray newline
47
+
48
+
49
+* ah/misc-doc-updates (2018-05-06) 7 commits
50
+ - doc: normalize [--options] to [options] in git-diff
51
+ - doc: add note about shell quoting to revision.txt
52
+ - git-svn: remove ''--add-author-from' for 'commit-diff'
53
+ - doc: add '-d' and '-o' for 'git push'
54
+ - doc: clarify ignore rules for git ls-files
55
+ - doc: align 'diff --no-index' in text and synopsis
56
+ - doc: improve formatting in githooks.txt
57
+
58
+ Misc doc fixes.
59
36
- We learned that our source files with ".pl" and ".py" extensions
37
- are Perl and Python files respectively and changes to them are
38
- better viewed as such with appropriate diff drivers.
60
+ Will merge to 'next'.
61
+
62
+
63
+* bc/format-patch-cover-no-attach (2018-05-02) 1 commit
64
+ - format-patch: make cover letters always text/plain
65
+
66
+ "git format-patch --cover --attach" created a broken MIME multipart
67
+ message for the cover letter, which has been fixed by keeping the
68
+ cover letter as plain text file.
69
70
Will merge to 'next'.
71
72
43
-* is/parsing-line-range (2018-04-27) 2 commits
44
- . log: prevent error if line range ends past end of file
45
- . blame: prevent error if range ends past end of file
73
+* bp/test-drop-caches (2018-05-04) 1 commit
74
+ - test-drop-caches: simplify delay loading of NtSetSystemInformation
75
47
- Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
48
- take has been tweaked.
76
+ Code simplification.
77
50
- Seems to break a few tests.
78
+ Will merge to 'next'.
79
80
53
-* js/test-unset-prereq (2018-04-30) 1 commit
54
- - tests: introduce test_unset_prereq, for debugging
81
+* cc/perf-bisect (2018-05-06) 1 commit
82
+ - perf/bisect_run_script: disable codespeed
83
56
- Test debugging aid.
84
+ Performance test updates.
85
+
86
+ Will merge to 'next'.
87
+
88
+
89
+* cf/submodule-progress-dissociate (2018-05-04) 3 commits
90
+ - submodule: add --dissociate option to add/update commands
91
+ - submodule: add --progress option to add command
92
+ - submodule: clean up subsititions in script
93
+
94
+ "git submodule update" and "git submodule add" supported the
95
+ "--reference" option to borrow objects from a neighbouring local
96
+ repository like "git clone" does, but lacked the more recent
97
+ invention "--dissociate". Also "git submodule add" has been taught
98
+ to take the "--progress" option.
99
+
100
+ Is this ready for 'next'? Should "git submodule -h" list the new
101
+ options in its short help?
102
+
103
+
104
+* dd/send-email-reedit (2018-05-06) 1 commit
105
+ - git-send-email: allow re-editing of message
106
+
107
+ "git send-email" can sometimes offer confirmation dialog "Send this
108
+ email?" with choices 'Yes', 'No', 'Quit', and 'All'. A new action
109
+ 'Edit' has been added to this dialog's choice.
110
+
111
+ Waiting briefly for an ack or two.
112
+ cf. <xmqq4ljlsahj.fsf@gitster-ct.c.googlers.com>
113
+
114
+
115
+* em/status-rename-config (2018-05-06) 1 commit
116
+ - wt-status: use settings from git_diff_ui_config
117
+
118
+ "git status" learned to pay attention to UI related diff
119
+ configuration variables such as diff.renames.
120
+
121
+ Will merge to 'next'.
122
+
123
+
124
+* jm/cache-entry-from-mem-pool (2018-05-02) 5 commits
125
+ - block alloc: add validations around cache_entry lifecyle
126
+ - block alloc: allocate cache entries from mem_pool
127
+ - mem-pool: fill out functionality
128
+ - block alloc: add lifecycle APIs for cache_entry structs
129
+ - read-cache: teach refresh_cache_entry() to take istate
130
+
131
+ For a large tree, the index needs to hold many cache entries
132
+ allocated on heap. These cache entries are now allocated out of a
133
+ dedicated memory pool to amortize malloc(3) overhead.
134
+
135
+ Needs review.
136
+ Is the "caller always knows which pool an entry came from and calls
137
+ the right kind of free" a feasible approach?
138
+
139
+
140
+* js/branch-diff (2018-05-06) 18 commits
141
+ - completion: support branch-diff
142
+ - branch-diff: add a man page
143
+ - branch-diff --dual-color: work around bogus white-space warning
144
+ - branch-diff: offer to dual-color the diffs
145
+ - diff: add an internal option to dual-color diffs of diffs
146
+ - color: provide inverted colors, too
147
+ - branch-diff: use color for the commit pairs
148
+ - branch-diff: add tests
149
+ - branch-diff: do not show "function names" in hunk headers
150
+ - branch-diff: adjust the output of the commit pairs
151
+ - branch-diff: suppress the diff headers
152
+ - branch-diff: indent the diffs just like tbdiff
153
+ - branch-diff: right-trim commit messages
154
+ - branch-diff: also show the diff between patches
155
+ - branch-diff: improve the order of the shown commits
156
+ - branch-diff: first rudimentary implementation
157
+ - Add a new builtin: branch-diff
158
+ - Add a function to solve least-cost assignment problems
159
+
160
+ "git tbdiff" that lets us compare individual patches in two
161
+ iterations of a topic has been rewritten and made into a built-in
162
+ command.
163
+
164
+ Expecting a reroll.
165
+ cf. <nycvar.QRO.7.76.6.1805052351560.77@tvgsbejvaqbjf.bet>
166
+
167
+
168
+* js/sequencer-and-root-commits (2018-05-06) 6 commits
169
+ - rebase --rebase-merges: root commits can be cousins, too
170
+ - rebase --rebase-merges: a "merge" into a new root is a fast-forward
171
+ - sequencer: allow introducing new root commits
172
+ - rebase -i --root: let the sequencer handle even the initial part
173
+ - sequencer: learn about the special "fake root commit" handling
174
+ - sequencer: extract helper to update active_cache_tree
175
+ (this branch uses js/rebase-recreate-merge.)
176
+
177
+ The implementation of "git rebase -i --root" has been updaed to use
178
+ the sequencer machinery more.
179
+
180
+ Will merge to 'next'.
181
+
182
+
183
+* js/use-bug-macro (2018-05-06) 4 commits
184
+ - Convert remaining die*(BUG) messages
185
+ - Replace all die("BUG: ...") calls by BUG() ones
186
+ - run-command: use BUG() to report bugs, not die()
187
+ - test-tool: help verifying BUG() code paths
188
+
189
+
190
+* jt/partial-clone-proto-v2 (2018-05-06) 4 commits
191
+ - {fetch,upload}-pack: support filter in protocol v2
192
+ - upload-pack: read config when serving protocol v2
193
+ - upload-pack: fix error message typo
194
+ - Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2
195
+ (this branch uses bw/protocol-v2; is tangled with bw/server-options.)
196
+
197
+ Transfer protocol v2 learned to support the partial clone.
198
+
199
+ Will merge to 'next'.
200
+
201
+
202
+* ma/doc-expand-tabs (2018-05-02) 1 commit
203
+ - revisions.txt: expand tabs to spaces in diagram
204
+
205
+ Fix one instance of asciidoctor's misformatting by expanding a tab
206
+ into spaces in a literal block.
207
+
208
+ Will discard. This approach is less maintainable than the approach
209
+ taken by bc/asciidoctor-tab-width topic.
210
+
211
+
212
+* nd/completion-aliasfiletype-typofix (2018-05-06) 1 commit
213
+ - completion: fix misspelled config key aliasesfiletype
214
+
215
+ Typofix.
216
+
217
+ Will merge to 'next'.
218
+
219
+
220
+* nd/doc-header (2018-05-02) 1 commit
221
+ - doc: keep first level section header in upper case
222
+
223
+ Doc formatting fix.
224
+
225
+ Will merge to 'next'.
226
+
227
+
228
+* nd/pack-unreachable-objects-doc (2018-05-06) 1 commit
229
+ - pack-objects: validation and documentation about unreachable options
230
+
231
+ Doc update.
232
+
233
+ Will merge to 'next'.
234
+
235
+
236
+* sb/object-store-alloc (2018-05-02) 14 commits
237
+ - alloc.c: include alloc.h
238
+ - alloc: allow arbitrary repositories for alloc functions
239
+ - object: allow create_object to handle arbitrary repositories
240
+ - object: allow grow_object_hash to handle arbitrary repositories
241
+ - alloc: add repository argument to alloc_commit_index
242
+ - alloc: add repository argument to alloc_report
243
+ - alloc: add repository argument to alloc_object_node
244
+ - alloc: add repository argument to alloc_tag_node
245
+ - alloc: add repository argument to alloc_commit_node
246
+ - alloc: add repository argument to alloc_tree_node
247
+ - alloc: add repository argument to alloc_blob_node
248
+ - object: add repository argument to grow_object_hash
249
+ - object: add repository argument to create_object
250
+ - repository: introduce object parser field
251
+ (this branch uses sb/object-store-replace and sb/oid-object-info.)
252
+
253
+ The conversion to pass "the_repository" and then "a_repository"
254
+ throughout the object access API continues.
255
+
256
+
257
+* tb/grep-column (2018-05-06) 7 commits
258
+ - contrib/git-jump/git-jump: jump to match column in addition to line
259
+ - grep.c: add configuration variables to show matched option
260
+ - builtin/grep.c: add '--column' option to 'git-grep(1)'
261
+ - grep.c: display column number of first match
262
+ - grep.[ch]: extend grep_opt to allow showing matched column
263
+ - grep.c: expose matched column in match_line()
264
+ - Documentation/config.txt: camel-case lineNumber for consistency
265
+
266
+ "git grep" learned the "--column" option that gives not just the
267
+ line number but the column number of the hit.
268
+
269
+
270
+* bc/asciidoctor-tab-width (2018-05-07) 2 commits
271
+ - Documentation: render revisions correctly under Asciidoctor
272
+ - Documentation: use 8-space tabs with Asciidoctor
273
+
274
+ Asciidoctor gives a reasonable imitation for AsciiDoc, but does not
275
+ render illustration in a literal block correctly when indented with
276
+ HT by default. The problem is fixed by forcing 8-space tabs.
277
+
278
+ Will merge to 'next'.
279
+
280
+
281
+* bc/mailmap-self (2018-05-07) 1 commit
282
+ - mailmap: update brian m. carlson's email address
283
284
Will merge to 'next'.
285
286
--------------------------------------------------
287
[Stalled]
288
289
+* pc/submodule-helper-foreach (2018-02-02) 5 commits
290
+ - submodule: port submodule subcommand 'foreach' from shell to C
291
+ - submodule foreach: document variable '$displaypath'
292
+ - submodule foreach: clarify the '$toplevel' variable documentation
293
+ - submodule foreach: document '$sm_path' instead of '$path'
294
+ - submodule foreach: correct '$path' in nested submodules from a subdirectory
295
+
296
+ Expecting a response to review comments
297
+ e.g. cf. <20180206150044.1bffbb573c088d38c8e44bf5@google.com>
298
+
299
+
300
+* pw/add-p-select (2018-03-16) 3 commits
301
+ - add -p: optimize line selection for short hunks
302
+ - add -p: allow line selection to be inverted
303
+ - add -p: select individual hunk lines
304
+
305
+ "git add -p" interactive interface learned to let users choose
306
+ individual added/removed lines to be used in the operation, instead
307
+ of accepting or rejecting a whole hunk.
308
+
309
+ Expecting a reroll to reignite the discussion.
310
+ cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
311
+
312
+
313
+* jh/json-writer (2018-03-28) 1 commit
314
+ - json_writer: new routines to create data in JSON format
315
+
316
+ Preparatory code to later add json output for unspecified telemetry
317
+ data.
318
+
319
+ We do not add random code that does not have real users to our
320
+ codebase, so let's have it wait until such a real code materializes
321
+ before too long.
322
+
323
+
324
+* hn/bisect-first-parent (2018-04-21) 1 commit
325
+ - bisect: create 'bisect_flags' parameter in find_bisection()
326
+
327
+ Preliminary code update to allow passing more flags down the
328
+ bisection codepath in the future.
329
+
330
+ We do not add random code that does not have real users to our
331
+ codebase, so let's have it wait until such a real code materializes
332
+ before too long.
333
+
334
+
335
+* is/parsing-line-range (2018-04-27) 2 commits
336
+ . log: prevent error if line range ends past end of file
337
+ . blame: prevent error if range ends past end of file
338
+
339
+ Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
340
+ take has been tweaked.
341
+
342
+ Seems to break a few tests.
343
+
344
+
345
* ld/p4-unshelve (2018-02-22) 1 commit
346
- git-p4: add unshelve command
347
@@ -142,6 +424,35 @@ of the repositories listed at
424
--------------------------------------------------
425
[Cooking]
426
427
+* cc/perf-aggregate-unknown-option (2018-04-26) 1 commit
428
+ - perf/aggregate: use Getopt::Long for option parsing
429
+
430
+ Perf-test helper updates.
431
+
432
+ Will merge to 'next'.
433
+
434
+
435
+* ab/perl-python-attrs (2018-04-27) 3 commits
436
+ - .gitattributes: add a diff driver for Python
437
+ - .gitattributes: use the "perl" differ for Perl
438
+ - .gitattributes: add *.pl extension for Perl
439
+
440
+ We learned that our source files with ".pl" and ".py" extensions
441
+ are Perl and Python files respectively and changes to them are
442
+ better viewed as such with appropriate diff drivers.
443
+
444
+ Will merge to 'next'.
445
+
446
+
447
+* js/test-unset-prereq (2018-04-30) 1 commit
448
+ - tests: introduce test_unset_prereq, for debugging
449
+
450
+ Test debugging aid.
451
+
452
+ Will merge to 'next'.
453
+ cf. <20180507115950.3887-1-szeder.dev@gmail.com>
454
+
455
+
456
* fg/completion-external (2018-04-30) 1 commit
457
- completion: load completion file for external subcommand
458
@@ -150,6 +461,9 @@ of the repositories listed at
461
custom "git-$command" that the end user has on the $PATH when using
462
newer version of bash.
463
464
+ Will merge to 'next'.
465
+ cf. <CAM0VKjkTu+OkLM3gvX73mWugxArCVmqRBmWGHiKuLiLRNkkNow@mail.gmail.com>
466
+
467
468
* ma/double-dashes-in-docs (2018-04-18) 4 commits
469
(merged to 'next' on 2018-04-25 at aaac2dc63c)
@@ -271,7 +585,7 @@ of the repositories listed at
585
Will merge to 'next'.
586
587
274
-* js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits
588
+* js/rebase-i-clean-msg-after-fixup-continue (2018-05-02) 4 commits
589
- rebase --skip: clean up commit message after a failed fixup/squash
590
- sequencer: always commit without editing when asked for
591
- rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
@@ -300,7 +614,7 @@ of the repositories listed at
614
- ls-remote: send server options when using protocol v2
615
- serve: introduce the server-option capability
616
- Merge branch 'bw/protocol-v2' into HEAD
303
- (this branch uses bw/protocol-v2.)
617
+ (this branch uses bw/protocol-v2; is tangled with jt/partial-clone-proto-v2.)
618
619
The transport protocol v2 is getting updated further.
620
@@ -359,7 +673,7 @@ of the repositories listed at
673
Will merge to 'master'.
674
675
362
-* bc/object-id (2018-04-24) 41 commits
676
+* bc/object-id (2018-05-02) 42 commits
677
- merge-one-file: compute empty blob object ID
678
- add--interactive: compute the empty tree value
679
- Update shell scripts to compute empty tree object ID
@@ -376,6 +690,7 @@ of the repositories listed at
690
- merge: convert empty tree constant to the_hash_algo
691
- builtin/merge: switch tree functions to use object_id
692
- builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo
693
+ - sha1-file: add functions for hex empty tree and blob OIDs
694
- builtin/receive-pack: avoid hard-coded constants for push certs
695
- diff: specify abbreviation size in terms of the_hash_algo
696
- upload-pack: replace use of several hard-coded constants
@@ -395,7 +710,7 @@ of the repositories listed at
710
- pack-objects: abstract away hash algorithm
711
- packfile: abstract away hash constant values
712
- packfile: convert find_pack_entry to object_id
398
- - sha1_file: convert freshen functions to object_id
713
+ - sha1-file: convert freshen functions to object_id
714
- packfile: convert has_sha1_pack to object_id
715
- packfile: remove unused member from struct pack_entry
716
- Remove unused member in struct object_context
@@ -404,9 +719,6 @@ of the repositories listed at
719
720
Conversion from uchar[20] to struct object_id continues.
721
407
- Expecting a reroll.
408
- cf. <20180426011337.GA722934@genre.crustytoothpaste.net>
409
-
722
723
* sb/oid-object-info (2018-04-26) 9 commits
724
- cache.h: allow oid_object_info to handle arbitrary repositories
@@ -418,7 +730,7 @@ of the repositories listed at
730
- packfile: add repository argument to retry_bad_packed_offset
731
- cache.h: add repository argument to oid_object_info
732
- cache.h: add repository argument to oid_object_info_extended
421
- (this branch uses sb/object-store-replace.)
733
+ (this branch is used by sb/object-store-alloc; uses sb/object-store-replace.)
734
735
The codepath around object-info API has been taught to take the
736
repository object (which in turn tells the API which object store
@@ -427,19 +739,21 @@ of the repositories listed at
739
Will merge to 'next'.
740
741
430
-* en/unpack-trees-split-index-fix (2018-04-24) 1 commit
742
+* en/unpack-trees-split-index-fix (2018-05-02) 1 commit
743
- unpack_trees: fix breakage when o->src_index != o->dst_index
744
745
The split-index feature had a long-standing and dormant bug in
746
certain use of the in-core merge machinery, which has been fixed.
747
436
- Hold.
437
- cf. <CACsJy8DyP_mXXJKn52Jzqe63N3GLpXePCr8ha97Lv9hr6u-M0w@mail.gmail.com>
748
+ Will merge to 'next'.
749
+ cf. <CACsJy8CeDhrT9GXe9q5gqsAeq_sSQ8jyF2nMOFxzjwKtE31oPQ@mail.gmail.com>
750
751
440
-* bp/merge-rename-config (2018-04-25) 2 commits
441
- - merge: add merge.aggressive config setting
752
+* bp/merge-rename-config (2018-05-04) 3 commits
753
+ - merge: pass aggressive when rename detection is turned off
754
- merge: add merge.renames config setting
755
+ - merge: update documentation for {merge,diff}.renameLimit
756
+ (this branch uses en/rename-directory-detection-reboot.)
757
758
759
* en/git-debugger (2018-04-25) 1 commit
@@ -450,8 +764,8 @@ of the repositories listed at
764
Will merge to 'next'.
765
766
453
-* js/no-pager-shorthand (2018-04-25) 1 commit
454
- - git: add -N as a short option for --no-pager
767
+* js/no-pager-shorthand (2018-05-04) 1 commit
768
+ - git: add -P as a short option for --no-pager
769
770
"git --no-pager cmd" did not have short-and-sweet single letter
771
option. Now it does.
@@ -501,9 +815,10 @@ of the repositories listed at
815
Will merge to 'master'.
816
817
504
-* ds/generation-numbers (2018-04-26) 10 commits
818
+* ds/generation-numbers (2018-05-02) 11 commits
819
- commit-graph.txt: update design document
820
- merge: check config before loading commits
821
+ - commit: use generation number in remove_redundant()
822
- commit: add short-circuit to paint_down_to_common()
823
- commit: use generation numbers for in_merge_bases()
824
- ref-filter: use generation number for --contains
@@ -518,6 +833,8 @@ of the repositories listed at
833
pre-computed generation numbers to speed up the decisions to stop
834
history traversal.
835
836
+ Is this ready for 'next'?
837
+
838
839
* en/rename-directory-detection-reboot (2018-04-25) 36 commits
840
- merge-recursive: fix check for skipability of working tree updates
@@ -556,9 +873,15 @@ of the repositories listed at
873
- directory rename detection: testcases to avoid taking detection too far
874
- directory rename detection: directory splitting testcases
875
- directory rename detection: basic testcases
876
+ (this branch is used by bp/merge-rename-config.)
877
560
- Reboot of an attempt to detect wholesale directory renames and use
561
- it while merging.
878
+ Rename detection logic in "diff" family that is used in "merge" has
879
+ learned to guess when all of x/a, x/b and x/c have moved to z/a,
880
+ z/b and z/c, it is likely that x/d added in the meantime would also
881
+ want to move to z/d by taking the hint that the entire directory
882
+ 'x' moved to 'z'. Incidentally, this avoids updating a file in the
883
+ working tree after a (non-trivial) merge whose result matches what
884
+ our side originally had.
885
886
Will merge to 'next'.
887
@@ -579,6 +902,8 @@ of the repositories listed at
902
across a few places in the build procedure, but it now is getting a
903
bit more consolidated to allow more automation.
904
905
+ Is this ready for 'next'.
906
+
907
908
* sb/object-store-replace (2018-04-12) 15 commits
909
(merged to 'next' on 2018-04-25 at 9a213fb505)
@@ -597,7 +922,7 @@ of the repositories listed at
922
+ object-store: move lookup_replace_object to replace-object.h
923
+ replace-object: move replace_map to object store
924
+ replace_object: use oidmap
600
- (this branch is used by sb/oid-object-info.)
925
+ (this branch is used by sb/object-store-alloc and sb/oid-object-info.)
926
927
The effort to pass the repository in-core structure throughout the
928
API continues. This round deals with the code that implements the
@@ -606,17 +931,6 @@ of the repositories listed at
931
Will merge to 'master'.
932
933
609
-* hn/bisect-first-parent (2018-04-21) 1 commit
610
- - bisect: create 'bisect_flags' parameter in find_bisection()
611
-
612
- Preliminary code update to allow passing more flags down the
613
- bisection codepath in the future.
614
-
615
- We do not add random code that does not have real users to our
616
- codebase, so let's have it wait until such a real code materializes
617
- before too long.
618
-
619
-
934
* sg/complete-paths (2018-04-17) 11 commits
935
- completion: fill COMPREPLY directly when completing paths
936
- completion: improve handling quoted paths in 'git ls-files's output
@@ -655,6 +969,8 @@ of the repositories listed at
969
and also paint lines in different colors depending on the age of
970
the commit.
971
972
+ Is this ready for 'next'?
973
+
974
975
* ab/simplify-perl-makefile (2018-04-19) 2 commits
976
(merged to 'next' on 2018-04-25 at 906cf21682)
@@ -668,7 +984,9 @@ of the repositories listed at
984
Will merge to 'master'.
985
986
671
-* ds/lazy-load-trees (2018-04-11) 5 commits
987
+* ds/lazy-load-trees (2018-05-02) 6 commits
988
+ (merged to 'next' on 2018-05-02 at d54016d9e3)
989
+ + coccinelle: avoid wrong transformation suggestions from commit.cocci
990
(merged to 'next' on 2018-04-25 at b90813f421)
991
+ commit-graph: lazy-load trees for commits
992
+ treewide: replace maybe_tree with accessor methods
@@ -794,17 +1112,6 @@ of the repositories listed at
1112
Will merge to 'master'.
1113
1114
797
-* jh/json-writer (2018-03-28) 1 commit
798
- - json_writer: new routines to create data in JSON format
799
-
800
- Preparatory code to later add json output for unspecified telemetry
801
- data.
802
-
803
- We do not add random code that does not have real users to our
804
- codebase, so let's have it wait until such a real code materializes
805
- before too long.
806
-
807
-
1115
* ot/libify-get-ref-atom-value (2018-03-29) 6 commits
1116
(merged to 'next' on 2018-04-25 at 056bcaa69c)
1117
+ ref-filter: libify get_ref_atom_value()
@@ -906,10 +1213,8 @@ of the repositories listed at
1213
while doing its work, and shrinking its size helps the performance
1214
quite a bit.
1215
909
- What's the doneness of this thing? The interdiff since previous
910
- rounds looked reasonable, but I didn't see this round otherwise
911
- scrutinized by reviewers. The numbers given in the commit near the
912
- tip do look impressive, though ;-)
1216
+ Will merge to 'next'.
1217
+ cf. <CACsJy8CuVRy4UPEwXJJYAjePEz5zjKMLhRjh9UFw0DPYTzobkw@mail.gmail.com>
1218
1219
1220
* nd/repack-keep-pack (2018-04-16) 7 commits
@@ -927,22 +1232,8 @@ of the repositories listed at
1232
marked with ".keep" so that it is left untouched while objects in
1233
other packs and loose ones are repacked.
1234
930
- What's the doneness of this thing? The interdiff since the earlier
931
- one looked reasonable, but I didn't see this round otherwise
932
- scrutinized by reviewers.
933
-
934
-
935
-* pw/add-p-select (2018-03-16) 3 commits
936
- - add -p: optimize line selection for short hunks
937
- - add -p: allow line selection to be inverted
938
- - add -p: select individual hunk lines
939
-
940
- "git add -p" interactive interface learned to let users choose
941
- individual added/removed lines to be used in the operation, instead
942
- of accepting or rejecting a whole hunk.
943
-
944
- Expecting a reroll to reignite the discussion.
945
- cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
1235
+ Will merge to 'next'.
1236
+ cf. <CACsJy8CuVRy4UPEwXJJYAjePEz5zjKMLhRjh9UFw0DPYTzobkw@mail.gmail.com>
1237
1238
1239
* ds/commit-graph (2018-04-11) 16 commits
@@ -971,17 +1262,6 @@ of the repositories listed at
1262
Will merge to 'master'.
1263
1264
974
-* pc/submodule-helper-foreach (2018-02-02) 5 commits
975
- - submodule: port submodule subcommand 'foreach' from shell to C
976
- - submodule foreach: document variable '$displaypath'
977
- - submodule foreach: clarify the '$toplevel' variable documentation
978
- - submodule foreach: document '$sm_path' instead of '$path'
979
- - submodule foreach: correct '$path' in nested submodules from a subdirectory
980
-
981
- Expecting a response to review comments
982
- e.g. cf. <20180206150044.1bffbb573c088d38c8e44bf5@google.com>
983
-
984
-
1265
* tg/worktree-add-existing-branch (2018-04-30) 4 commits
1266
- worktree: teach "add" to check out existing branches
1267
- worktree: factor out dwim_branch function
@@ -1011,10 +1291,13 @@ of the repositories listed at
1291
- sequencer: refactor how original todo list lines are accessed
1292
- sequencer: make rearrange_squash() a bit more obvious
1293
- sequencer: avoid using errno clobbered by rollback_lock_file()
1294
+ (this branch is used by js/sequencer-and-root-commits.)
1295
1296
"git rebase" learned "--rebase-merges" to transplant the whole
1297
topology of commit graph elsewhere.
1298
1299
+ Will merge to 'next'.
1300
+
1301
1302
* bw/protocol-v2 (2018-03-15) 35 commits
1303
(merged to 'next' on 2018-04-11 at 23ee234a2c)
@@ -1053,7 +1336,7 @@ of the repositories listed at
1336
+ pkt-line: add delim packet support
1337
+ pkt-line: allow peeking a packet line without consuming it
1338
+ pkt-line: introduce packet_read_with_status
1056
- (this branch is used by bw/server-options.)
1339
+ (this branch is used by bw/server-options and jt/partial-clone-proto-v2.)
1340
1341
The beginning of the next-gen transfer protocol.
1342