What's cooking (2018/06 #04)
Junio C Hamano committed
Jun 15, 2018 at 13:24 UTC
402d90443233fab032e5f1dcc13d22e2d4cb4986
1 file changed
+367
-139
whats-cooking.txt
+367
-139
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2018, #03; Tue, 12)
4
-X-master-at: 6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a
5
-X-next-at: 331a1db143dd028146b93af7da9e32f451bf2002
3
+Subject: What's cooking in git.git (Jun 2018, #04; Fri, 15)
4
+X-master-at: 68372c88794aba15f853542008cda39def768372
5
+X-next-at: 013aa6912eb2e1677775c77626d7d5dcd8eaad9f
6
7
-What's cooking in git.git (Jun 2018, #03; Tue, 12)
7
+What's cooking in git.git (Jun 2018, #04; Fri, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,30 +12,31 @@ 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
+We passed -rc2 mark; there are still a few hotfixes that correct
16
+obvious bugs introduced during this cycle in trivial ways that need
17
+to be merged before the final, and I also need to pull the i18n/l10n
18
+updates, but other than that, I think we are in relatively good
19
+shape given the upcoming release is fairly a big one judging from
20
+historical norms. Knock, knock...
21
+
22
You can find the changes described here in the integration branches
23
of the repositories listed at
24
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
21
-[New Topics]
22
-
23
-* ab/refspec-init-fix (2018-06-11) 3 commits
24
- - refspec: initalize `refspec_item` in `valid_fetch_refspec()`
25
- - refspec: add back a refspec_item_init() function
26
- - refspec: s/refspec_item_init/&_or_die/g
27
-
28
- Make refspec parsing codepath more robust.
29
-
30
- Will merge to 'next'.
31
-
32
-
33
-* as/safecrlf-quiet-fix (2018-06-11) 1 commit
34
- - config.c: fix regression for core.safecrlf false
28
+[Graduated to "master"]
29
36
- Fix for 2.17-era regression.
30
+* jk/index-pack-maint (2018-06-11) 3 commits
31
+ (merged to 'next' on 2018-06-11 at f85a566b11)
32
+ + index-pack: correct install_packed_git() args
33
+ (merged to 'next' on 2018-06-04 at c553a485e8)
34
+ + index-pack: handle --strict checks of non-repo packs
35
+ + prepare_commit_graft: treat non-repository as a noop
36
38
- Will merge to 'next'.
37
+ "index-pack --strict" has been taught to make sure that it runs the
38
+ final object integrity checks after making the freshly indexed
39
+ packfile available to itself.
40
41
42
* jk/submodule-fsck-loose-fixup (2018-06-11) 2 commits
@@ -45,8 +46,6 @@ of the repositories listed at
46
47
Finishing touches to a topic that already is in 'maint'.
48
48
- Will merge to 'master' and then to 'maint'.
49
-
49
50
* sb/submodule-merge-in-merge-recursive (2018-06-11) 1 commit
51
(merged to 'next' on 2018-06-11 at ad05b6bc6a)
@@ -54,8 +53,6 @@ of the repositories listed at
53
54
Finishing touches to a topic that already is in 'master'.
55
57
- Will merge to 'master'.
58
-
56
57
* sg/completion-zsh-workaround (2018-06-12) 1 commit
58
(merged to 'next' on 2018-06-12 at 331a1db143)
@@ -63,55 +60,171 @@ of the repositories listed at
60
61
Work around zsh segfaulting when loading git-completion.zsh
62
63
+--------------------------------------------------
64
+[New Topics]
65
+
66
+* ab/cred-netrc-no-autodie (2018-06-13) 1 commit
67
+ (merged to 'next' on 2018-06-14 at 68171b82a7)
68
+ + git-credential-netrc: remove use of "autodie"
69
+
70
+ Hotfix for contrib/ stuff broken by this cycle.
71
+
72
Will merge to 'master'.
73
74
69
-* sg/gpg-tests-fix (2018-06-11) 2 commits
70
- - tests: make forging GPG signed commits and tags more robust
71
- - t7510-signed-commit: use 'test_must_fail'
75
+* jl/zlib-restore-nul-termination (2018-06-13) 1 commit
76
+ (merged to 'next' on 2018-06-14 at 3fa108363e)
77
+ + packfile: correct zlib buffer handling
78
+
79
+ Make zlib inflate codepath more robust against versions of zlib
80
+ that clobber unused portion of outbuf.
81
+
82
+ Will merge to 'master'.
83
+
84
+
85
+* rd/doc-remote-tracking-with-hyphen (2018-06-13) 1 commit
86
+ (merged to 'next' on 2018-06-14 at 013aa6912e)
87
+ + Use hyphenated "remote-tracking branch" (docs and comments)
88
+
89
+ Doc update.
90
+
91
+ Will merge to 'master'.
92
+
93
+
94
+* en/rename-directory-detection (2018-06-14) 1 commit
95
+ (merged to 'next' on 2018-06-14 at 0e4c6bd117)
96
+ + merge-recursive: use xstrdup() instead of fixed buffer
97
+
98
+ Newly added codepath in merge-recursive had potential buffer
99
+ overrun, which has been fixed.
100
+
101
+ Will merge to 'master'.
102
+
103
+
104
+* mw/doc-merge-enumfix (2018-06-14) 1 commit
105
+ (merged to 'next' on 2018-06-14 at 7074d6d48e)
106
+ + doc: update the order of the syntax `git merge --continue`
107
+
108
+ Fix old merge glitch in Documentation during v2.13-rc0 era.
109
+
110
+ Will merge to 'master'.
111
+
112
+
113
+* sb/blame-color (2018-06-14) 1 commit
114
+ (merged to 'next' on 2018-06-14 at f8cd824d4d)
115
+ + blame: release string_list after use in parse_color_fields()
116
+
117
+ Leakfix.
118
+
119
+ Will merge to 'master'.
120
+
121
+
122
+* ks/branch-set-upstream (2018-06-14) 1 commit
123
+ - t3200: clarify description of --set-upstream test
124
+
125
+ A test title has been reworded to clarify it.
126
+
127
+
128
+* jt/fetch-pack-negotiator (2018-06-15) 7 commits
129
+ - fetch-pack: introduce negotiator API
130
+ - fetch-pack: move common check and marking together
131
+ - fetch-pack: make negotiation-related vars local
132
+ - fetch-pack: use ref adv. to prune "have" sent
133
+ - fetch-pack: directly end negotiation if ACK ready
134
+ - fetch-pack: clear marks before re-marking
135
+ - fetch-pack: split up everything_local()
136
+
137
+ Code restructuring and a small fix to transport protocol v2 during
138
+ fetching.
139
+
140
+
141
+* ag/rebase-i-append-todo-help (2018-06-14) 2 commits
142
+ - rebase--interactive: rewrite append_todo_help() in C
143
+ - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
144
+ (this branch is used by ag/rebase-i-rewrite-todo; uses ag/rebase-p.)
145
+
146
+ Stepwise rewriting of the machinery of "rebase -i" into C continues.
147
+
148
+
149
+* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits
150
+ - rebase--interactive: rewrite the edit-todo functionality in C
151
+ - editor: add a function to launch the sequence editor
152
+ - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
153
+ (this branch uses ag/rebase-i-append-todo-help and ag/rebase-p.)
154
+
155
+ Stepwise rewriting of the machinery of "rebase -i" into C continues.
156
73
- Some flaky tests have been fixed.
157
+
158
+* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits
159
+ - t5526: test recursive submodules when fetching moved submodules
160
+ - submodule: fix NULL correctness in renamed broken submodules
161
+
162
+ The code to try seeing if a fetch is necessary in a submodule
163
+ during a fetch with --recurse-submodules got confused when the path
164
+ to the submodule was changed in the range of commits in the
165
+ superproject, sometimes showing "(null)". This has been corrected.
166
167
Will merge to 'next'.
168
169
78
-* jk/fetch-all-peeled-fix (2018-06-11) 1 commit
79
- - fetch-pack: don't try to fetch peel values with --all
170
+* sb/submodule-core-worktree (2018-06-14) 3 commits
171
+ - submodule deinit: unset core.worktree
172
+ - submodule: ensure core.worktree is set after update
173
+ - submodule: unset core.worktree if no working tree is present
174
175
+ "git submodule" did not correctly adjust core.worktree setting that
176
+ indicates whether/where a submodule repository has its associated
177
+ working tree across various state transitions, which has been
178
+ corrected.
179
82
-* rd/diff-options-typofix (2018-06-11) 1 commit
83
- - diff-options.txt: fix minor typos, font inconsistencies, in docs
180
+ Will merge to 'next'.
181
182
86
-* ld/git-p4-updates (2018-06-12) 6 commits
87
- - git-p4: auto-size the block
88
- - git-p4: narrow the scope of exceptions caught when parsing an int
89
- - git-p4: raise exceptions from p4CmdList based on error from p4 server
90
- - git-p4: better error reporting when p4 fails
91
- - git-p4: add option to disable syncing of p4/master with p4
92
- - git-p4: disable-rebase: allow setting this via configuration
93
- (this branch uses rm/p4-submit-with-commit-option.)
183
+* jk/ewah-bounds-check (2018-06-15) 2 commits
184
+ - ewah: adjust callers of ewah_read_mmap()
185
+ - ewah_read_mmap: bounds-check mmap reads
186
+ (this branch is used by ds/ewah-cleanup.)
187
188
+ The code to read compressed bitmap was not careful to avoid reading
189
+ past the end of the file, which has been corrected.
190
96
-* en/merge-recursive-cleanup (2018-06-12) 6 commits
97
- - merge-recursive: add pointer about unduly complex looking code
98
- - merge-recursive: rename conflict_rename_*() family of functions
99
- - merge-recursive: clarify the rename_dir/RENAME_DIR meaning
100
- - merge-recursive: align labels with their respective code blocks
101
- - merge-recursive: fix numerous argument alignment issues
102
- - merge-recursive: fix miscellaneous grammar error in comment
191
+ Will merge to 'next'.
192
193
105
-* jh/partial-clone (2018-06-12) 1 commit
106
- - list-objects: check if filter is NULL before using
194
+* ds/ewah-cleanup (2018-06-15) 9 commits
195
+ - ewah: drop ewah_serialize_native function
196
+ - ewah: drop ewah_deserialize function
197
+ - ewah_io: delete unused 'ewah_serialize()'
198
+ - ewah_bitmap: delete unused 'ewah_or()'
199
+ - ewah_bitmap: delete unused 'ewah_not()'
200
+ - ewah_bitmap: delete unused 'ewah_and_not()'
201
+ - ewah_bitmap: delete unused 'ewah_and()'
202
+ - ewah/bitmap.c: delete unused 'bitmap_each_bit()'
203
+ - ewah/bitmap.c: delete unused 'bitmap_clear()'
204
+ (this branch uses jk/ewah-bounds-check.)
205
206
+ Remove unused function definitions and declarations from ewah
207
+ bitmap subsystem.
208
109
-* km/doc-workflows-typofix (2018-06-12) 1 commit
110
- - gitworkflows: fix grammar in 'Merge upwards' rule
209
+ Will merge to 'next'.
210
211
113
-* ms/send-pack-honor-config (2018-06-12) 1 commit
114
- - builtin/send-pack: populate the default configs
212
+* jc/clean-after-sanity-tests (2018-06-15) 1 commit
213
+ - tests: clean after SANITY tests
214
+
215
+ test cleanup.
216
+
217
+ Will merge to 'next'.
218
+
219
+
220
+* es/make-no-iconv (2018-06-15) 1 commit
221
+ - Makefile: make NO_ICONV really mean "no iconv"
222
+
223
+ "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
224
+ (i.e. linkage of -lintl, -liconv, etc. that are platform-specific
225
+ tweaks), which has been corrected.
226
+
227
+ Will merge to 'next'.
228
229
--------------------------------------------------
230
[Stalled]
@@ -148,8 +261,8 @@ of the repositories listed at
261
cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
262
263
151
-* jh/json-writer (2018-03-28) 1 commit
152
- - json_writer: new routines to create data in JSON format
264
+* jh/json-writer (2018-06-13) 1 commit
265
+ - json_writer: new routines to create JSON data
266
267
Preparatory code to later add json output for unspecified telemetry
268
data.
@@ -170,16 +283,6 @@ of the repositories listed at
283
before too long.
284
285
173
-* is/parsing-line-range (2018-06-01) 2 commits
174
- . log: prevent error if line range ends past end of file
175
- . blame: prevent error if range ends past end of file
176
-
177
- Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
178
- take has been tweaked.
179
-
180
- Updated. Still seems to break a few tests.
181
-
182
-
286
* av/fsmonitor-updates (2018-01-04) 6 commits
287
- fsmonitor: use fsmonitor data in `git diff`
288
- fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
@@ -195,7 +298,7 @@ of the repositories listed at
298
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
299
300
198
-* pb/bisect-helper-2 (2017-10-28) 8 commits
301
+* pb/bisect-helper-2 (2018-06-13) 8 commits
302
- t6030: make various test to pass GETTEXT_POISON tests
303
- bisect--helper: `bisect_start` shell function partially in C
304
- bisect--helper: `get_terms` & `bisect_terms` shell function in C
@@ -208,6 +311,11 @@ of the repositories listed at
311
Expecting a reroll.
312
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
313
314
+ I just rebased the topic to a newer base as it did not build
315
+ standalone with the base I originally queued the topic on, but
316
+ otherwise there is no update to address any of the review comments
317
+ in the thread above---we are still waiting for a reroll.
318
+
319
320
* mk/http-backend-content-length (2018-06-11) 3 commits
321
- http-backend: respect CONTENT_LENGTH for receive-pack
@@ -245,6 +353,124 @@ of the repositories listed at
353
--------------------------------------------------
354
[Cooking]
355
356
+* is/parsing-line-range (2018-06-15) 2 commits
357
+ - log: prevent error if line range ends past end of file
358
+ - blame: prevent error if range ends past end of file
359
+
360
+ Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
361
+ take has been tweaked.
362
+
363
+
364
+* ab/refspec-init-fix (2018-06-11) 3 commits
365
+ (merged to 'next' on 2018-06-13 at 91d71d8435)
366
+ + refspec: initalize `refspec_item` in `valid_fetch_refspec()`
367
+ + refspec: add back a refspec_item_init() function
368
+ + refspec: s/refspec_item_init/&_or_die/g
369
+
370
+ Make refspec parsing codepath more robust.
371
+
372
+ Will cook in 'next'.
373
+
374
+
375
+* as/safecrlf-quiet-fix (2018-06-11) 1 commit
376
+ (merged to 'next' on 2018-06-13 at b163674843)
377
+ + config.c: fix regression for core.safecrlf false
378
+
379
+ Fix for 2.17-era regression.
380
+
381
+ Will cook in 'next'.
382
+
383
+
384
+* sg/gpg-tests-fix (2018-06-11) 2 commits
385
+ (merged to 'next' on 2018-06-13 at f3a05f1c41)
386
+ + tests: make forging GPG signed commits and tags more robust
387
+ + t7510-signed-commit: use 'test_must_fail'
388
+
389
+ Some flaky tests have been fixed.
390
+
391
+ Will cook in 'next'.
392
+
393
+
394
+* jk/fetch-all-peeled-fix (2018-06-13) 2 commits
395
+ (merged to 'next' on 2018-06-13 at 1333bb9d90)
396
+ + fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits
397
+ + fetch-pack: don't try to fetch peel values with --all
398
+
399
+ "git fetch-pack --all" used to unnecessarily fail upon seeing an
400
+ annotated tag that points at an object other than a commit.
401
+
402
+ Will cook in 'next'.
403
+
404
+
405
+* rd/diff-options-typofix (2018-06-11) 1 commit
406
+ (merged to 'next' on 2018-06-13 at a5aa58fa1b)
407
+ + diff-options.txt: fix minor typos, font inconsistencies, in docs
408
+
409
+ Typofix.
410
+
411
+ Will merge to 'master'.
412
+
413
+
414
+* ld/git-p4-updates (2018-06-12) 6 commits
415
+ (merged to 'next' on 2018-06-13 at 4f7e24b3c4)
416
+ + git-p4: auto-size the block
417
+ + git-p4: narrow the scope of exceptions caught when parsing an int
418
+ + git-p4: raise exceptions from p4CmdList based on error from p4 server
419
+ + git-p4: better error reporting when p4 fails
420
+ + git-p4: add option to disable syncing of p4/master with p4
421
+ + git-p4: disable-rebase: allow setting this via configuration
422
+ (this branch uses rm/p4-submit-with-commit-option.)
423
+
424
+ "git p4" updates.
425
+
426
+ Will merge to 'master'.
427
+
428
+
429
+* en/merge-recursive-cleanup (2018-06-12) 6 commits
430
+ - merge-recursive: add pointer about unduly complex looking code
431
+ - merge-recursive: rename conflict_rename_*() family of functions
432
+ - merge-recursive: clarify the rename_dir/RENAME_DIR meaning
433
+ - merge-recursive: align labels with their respective code blocks
434
+ - merge-recursive: fix numerous argument alignment issues
435
+ - merge-recursive: fix miscellaneous grammar error in comment
436
+
437
+ Code cleanup.
438
+
439
+ Will merge to 'next'.
440
+
441
+
442
+* jh/partial-clone (2018-06-12) 1 commit
443
+ (merged to 'next' on 2018-06-13 at 818f864b0c)
444
+ + list-objects: check if filter is NULL before using
445
+
446
+ The recent addition of "partial clone" experimental feature kicked
447
+ in when it shouldn't, namely, when there is no partial-clone filter
448
+ defined even if extensions.partialclone is set.
449
+
450
+ Will cook in 'next'.
451
+
452
+
453
+* km/doc-workflows-typofix (2018-06-12) 1 commit
454
+ (merged to 'next' on 2018-06-13 at 21e6a8e67b)
455
+ + gitworkflows: fix grammar in 'Merge upwards' rule
456
+
457
+ Typofix.
458
+
459
+ Will merge to 'master'.
460
+
461
+
462
+* ms/send-pack-honor-config (2018-06-12) 1 commit
463
+ (merged to 'next' on 2018-06-13 at e2cd933715)
464
+ + builtin/send-pack: populate the default configs
465
+
466
+ "git send-pack --signed" (hence "git push --signed" over the http
467
+ transport) did not read user ident from the config mechanism to
468
+ determine whom to sign the push certificate as, which has been
469
+ corrected.
470
+
471
+ Will cook in 'next'.
472
+
473
+
474
* ab/checkout-default-remote (2018-06-11) 8 commits
475
- checkout & worktree: introduce checkout.defaultRemote
476
- checkout: add advice for ambiguous "checkout <branch>"
@@ -257,13 +483,14 @@ of the repositories listed at
483
484
485
* nd/reject-empty-shallow-request (2018-06-04) 1 commit
260
- - upload-pack: reject shallow requests that would return nothing
486
+ (merged to 'next' on 2018-06-13 at d6b6a1c3a7)
487
+ + upload-pack: reject shallow requests that would return nothing
488
489
"git fetch --shallow-since=<cutoff>" that specifies the cut-off
490
point that is newer than the existing history used to end up
491
grabbing the entire history. Such a request now errors out.
492
266
- Will merge to 'next'.
493
+ Will cook in 'next'.
494
495
496
* pw/add-p-recount (2018-06-11) 1 commit
@@ -276,73 +503,66 @@ of the repositories listed at
503
Git 2.17 timeframe failed to parse such a patch, but now it learned
504
to notice the situation and cope with it.
505
279
- Will merge to and cook in 'next'.
506
+ Will merge to 'next'.
507
508
509
* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit
283
- - sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
510
+ (merged to 'next' on 2018-06-13 at 38ef825556)
511
+ + sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
512
513
In code comment typofix
514
287
- Will merge to 'next'.
515
+ Will merge to 'master'.
516
517
518
* sg/update-ref-stdin-cleanup (2018-06-04) 1 commit
291
- - update-ref --stdin: use skip_prefix()
519
+ (merged to 'next' on 2018-06-13 at 2b9924760d)
520
+ + update-ref --stdin: use skip_prefix()
521
522
Code cleanup.
523
295
- Will merge to 'next'.
524
+ Will cook in 'next'.
525
526
527
* cc/tests-without-assuming-ref-files-backend (2018-06-04) 1 commit
299
- - t9104: kosherly remove remote refs
528
+ (merged to 'next' on 2018-06-13 at 7e2f74431c)
529
+ + t9104: kosherly remove remote refs
530
531
Instead of mucking with filesystem directly, use plumbing commands
532
update-ref etc. to manipulate the refs in the tests.
533
304
- Will merge to 'next'.
534
+ Will cook in 'next'.
535
536
537
* ag/rebase-p (2018-06-01) 4 commits
308
- - rebase: remove -p code from git-rebase--interactive.sh
309
- - rebase: use the new git-rebase--preserve-merges.sh
310
- - rebase: strip unused code in git-rebase--preserve-merges.sh
311
- - rebase: introduce a dedicated backend for --preserve-merges
538
+ (merged to 'next' on 2018-06-13 at dd6f8a51d7)
539
+ + rebase: remove -p code from git-rebase--interactive.sh
540
+ + rebase: use the new git-rebase--preserve-merges.sh
541
+ + rebase: strip unused code in git-rebase--preserve-merges.sh
542
+ + rebase: introduce a dedicated backend for --preserve-merges
543
+ (this branch is used by ag/rebase-i-append-todo-help and ag/rebase-i-rewrite-todo.)
544
545
Separate "rebase -p" codepath out of "rebase -i" implementation to
546
slim down the latter and make it easier to manage.
547
316
- Will merge to 'next'.
317
-
318
-
319
-* jk/index-pack-maint (2018-06-11) 3 commits
320
- (merged to 'next' on 2018-06-11 at f85a566b11)
321
- + index-pack: correct install_packed_git() args
322
- (merged to 'next' on 2018-06-04 at c553a485e8)
323
- + index-pack: handle --strict checks of non-repo packs
324
- + prepare_commit_graft: treat non-repository as a noop
325
-
326
- "index-pack --strict" has been taught to make sure that it runs the
327
- final object integrity checks after making the freshly indexed
328
- packfile available to itself.
329
-
330
- Will merge to 'master'.
548
+ Will cook in 'next'.
549
550
551
* ls/complete-remote-update-names (2018-06-01) 1 commit
334
- - completion: complete remote names too
552
+ (merged to 'next' on 2018-06-13 at 86b4d23278)
553
+ + completion: complete remote names too
554
555
"git remote update" can take both a single remote nickname and a
556
nickname for remote groups, and the completion script (in contrib/)
557
has been taught about it.
558
340
- Will merge to and cook in 'next'.
559
+ Will cook in 'next'.
560
561
562
* sb/plug-misc-leaks (2018-06-04) 5 commits
344
- - SQUASH: tentatively cast const-ness away when calling free()
345
- - sequencer.c: plug mem leak in git_sequencer_config
563
+ (merged to 'next' on 2018-06-13 at bf68cabe28)
564
+ + SQUASH: tentatively cast const-ness away when calling free()
565
+ + sequencer.c: plug mem leak in git_sequencer_config
566
(merged to 'next' on 2018-06-04 at fbefac1c7a)
567
+ sequencer.c: plug leaks in do_pick_commit
568
+ submodule--helper: plug mem leak in print_default_remote
@@ -350,7 +570,7 @@ of the repositories listed at
570
571
Misc leak plugging.
572
353
- Will merge to 'next'.
573
+ Will cook in 'next'.
574
575
576
* ds/commit-graph-fsck (2018-05-29) 20 commits
@@ -415,26 +635,27 @@ of the repositories listed at
635
636
637
* nd/complete-config-vars (2018-05-29) 13 commits
418
- - completion: complete general config vars in two steps
419
- - log-tree: allow to customize 'grafted' color
420
- - completion: support case-insensitive config vars
421
- - completion: keep other config var completion in camelCase
422
- - completion: drop the hard coded list of config vars
423
- - am: move advice.amWorkDir parsing back to advice.c
424
- - advice: keep config name in camelCase in advice_config[]
425
- - fsck: produce camelCase config key names
426
- - help: add --config to list all available config
427
- - fsck: factor out msg_id_info[] lazy initialization code
428
- - grep: keep all colors in an array
429
- - Add and use generic name->id mapping code for color slot parsing
430
- - Merge branch 'nd/command-list' into nd/complete-config-vars
638
+ (merged to 'next' on 2018-06-13 at c2dd5546d0)
639
+ + completion: complete general config vars in two steps
640
+ + log-tree: allow to customize 'grafted' color
641
+ + completion: support case-insensitive config vars
642
+ + completion: keep other config var completion in camelCase
643
+ + completion: drop the hard coded list of config vars
644
+ + am: move advice.amWorkDir parsing back to advice.c
645
+ + advice: keep config name in camelCase in advice_config[]
646
+ + fsck: produce camelCase config key names
647
+ + help: add --config to list all available config
648
+ + fsck: factor out msg_id_info[] lazy initialization code
649
+ + grep: keep all colors in an array
650
+ + Add and use generic name->id mapping code for color slot parsing
651
+ + Merge branch 'nd/command-list' into nd/complete-config-vars
652
653
Continuing with the idea to programatically enumerate various
654
pieces of data required for command line completion, teach the
655
codebase to report the list of configuration variables
656
subcommands care about to help complete them.
657
437
- Will merge to and cook in 'next'.
658
+ Will cook in 'next'.
659
660
661
* nd/completion-negation (2018-06-11) 3 commits
@@ -447,28 +668,34 @@ of the repositories listed at
668
has been taught to enumerate options prefixed with "--no-" to
669
negate them.
670
450
- Will merge to and cook in 'next'.
671
+ Will merge to 'next'.
672
673
674
* jm/cache-entry-from-mem-pool (2018-05-24) 7 commits
454
- - block alloc: add validations around cache_entry lifecyle
455
- - block alloc: allocate cache entries from mem_pool
456
- - mem-pool: fill out functionality
457
- - mem-pool: add lifecycle management functions
458
- - mem-pool: only search head block for available space
459
- - block alloc: add lifecycle APIs for cache_entry structs
460
- - read-cache: teach refresh_cache_entry() to take istate
675
+ (merged to 'next' on 2018-06-13 at 34a0e21f3e)
676
+ + block alloc: add validations around cache_entry lifecyle
677
+ + block alloc: allocate cache entries from mem_pool
678
+ + mem-pool: fill out functionality
679
+ + mem-pool: add lifecycle management functions
680
+ + mem-pool: only search head block for available space
681
+ + block alloc: add lifecycle APIs for cache_entry structs
682
+ + read-cache: teach refresh_cache_entry() to take istate
683
684
For a large tree, the index needs to hold many cache entries
685
allocated on heap. These cache entries are now allocated out of a
686
dedicated memory pool to amortize malloc(3) overhead.
687
688
+ Will cook in 'next'.
689
+
690
467
-* rm/p4-submit-with-commit-option (2018-05-21) 1 commit
468
- - git-p4: add options --commit and --disable-rebase
691
+* rm/p4-submit-with-commit-option (2018-06-12) 1 commit
692
+ (merged to 'next' on 2018-06-13 at d3a272c733)
693
+ + git-p4: add options --commit and --disable-rebase
694
(this branch is used by ld/git-p4-updates.)
695
471
- Needs sign-off.
696
+ "git p4" updates.
697
+
698
+ Will merge to 'master'.
699
700
701
* ds/commit-graph-lockfile-fix (2018-05-22) 1 commit
@@ -551,7 +778,7 @@ of the repositories listed at
778
The conversion to pass "the_repository" and then "a_repository"
779
throughout the object access API continues.
780
554
- Will merge to and cook in 'next'.
781
+ Will merge to 'next'.
782
783
784
* pc/submodule-helper-foreach (2018-05-11) 4 commits
@@ -596,25 +823,26 @@ of the repositories listed at
823
824
825
* sb/object-store-alloc (2018-05-16) 13 commits
599
- - alloc: allow arbitrary repositories for alloc functions
600
- - object: allow create_object to handle arbitrary repositories
601
- - object: allow grow_object_hash to handle arbitrary repositories
602
- - alloc: add repository argument to alloc_commit_index
603
- - alloc: add repository argument to alloc_report
604
- - alloc: add repository argument to alloc_object_node
605
- - alloc: add repository argument to alloc_tag_node
606
- - alloc: add repository argument to alloc_commit_node
607
- - alloc: add repository argument to alloc_tree_node
608
- - alloc: add repository argument to alloc_blob_node
609
- - object: add repository argument to grow_object_hash
610
- - object: add repository argument to create_object
611
- - repository: introduce parsed objects field
826
+ (merged to 'next' on 2018-06-13 at 2868c2db9d)
827
+ + alloc: allow arbitrary repositories for alloc functions
828
+ + object: allow create_object to handle arbitrary repositories
829
+ + object: allow grow_object_hash to handle arbitrary repositories
830
+ + alloc: add repository argument to alloc_commit_index
831
+ + alloc: add repository argument to alloc_report
832
+ + alloc: add repository argument to alloc_object_node
833
+ + alloc: add repository argument to alloc_tag_node
834
+ + alloc: add repository argument to alloc_commit_node
835
+ + alloc: add repository argument to alloc_tree_node
836
+ + alloc: add repository argument to alloc_blob_node
837
+ + object: add repository argument to grow_object_hash
838
+ + object: add repository argument to create_object
839
+ + repository: introduce parsed objects field
840
(this branch is used by sb/object-store-grafts.)
841
842
The conversion to pass "the_repository" and then "a_repository"
843
throughout the object access API continues.
844
617
- Will merge to and cook in 'next'.
845
+ Will cook in 'next'.
846
847
848
* tb/grep-column (2018-05-14) 7 commits