What's cooking (2018/04 #01)
Junio C Hamano committed
Apr 9, 2018 at 19:17 UTC
b00e076bef3b0e6e37769f995be925cb0c977189
1 file changed
+343
-129
whats-cooking.txt
+343
-129
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2018, #06; Fri, 30)
4
-X-master-at: c2a499e6c31ed613a606ffdeb5bb74ab41e9a586
5
-X-next-at: caa68db14db9f582fb6802d6d3c880bb7760ad52
3
+Subject: What's cooking in git.git (Apr 2018, #01; Mon, 9)
4
+X-master-at: 468165c1d8a442994a825f3684528361727cd8c0
5
+X-next-at: 0c8726318caac19d9d977b9d5c971576311abb84
6
7
-What's cooking in git.git (Mar 2018, #06; Fri, 30)
7
+What's cooking in git.git (Apr 2018, #01; Mon, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,18 @@ 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.17 final is expected to be tagged by early next week.
15
+I try to summarize what each topic is about immediately after the
16
+list of commits on the topic, which may be followed by a short term
17
+plan for the topic ("Will merge to 'next'", etc.), possibly followed
18
+by a reminder (e.g. "cf. <message-id>") to help me recall the reason
19
+behind the plan. Please do not read more than that into "cf." (e.g.
20
+the ones listed are not more important than other messages in the
21
+same thread).
22
+
23
+The tip of 'next' has not been rewind post 2.17 release. I plan to
24
+flush as many solid topics that have been cooking there down to
25
+'master' first without merging anything new to 'next', and then
26
+do so sometime in this week. Let's see how it goes.
27
28
You can find the changes described here in the integration branches
29
of the repositories listed at
@@ -22,114 +33,207 @@ of the repositories listed at
33
--------------------------------------------------
34
[Graduated to "master"]
35
25
-* jh/partial-clone (2018-03-25) 1 commit
26
- (merged to 'next' on 2018-03-28 at 2a0a7aef8e)
27
- + unpack-trees: release oid_array after use in check_updates()
36
+* pw/add-p-single (2018-03-31) 1 commit
37
+ (merged to 'next' on 2018-03-31 at 43a177f941)
38
+ + add -p: fix 2.17.0-rc* regression due to moved code
39
40
Hotfix.
41
42
--------------------------------------------------
43
[New Topics]
44
34
-* rs/status-with-removed-submodule (2018-03-28) 1 commit
35
- (merged to 'next' on 2018-03-30 at 8a7b618bc1)
36
- + submodule: check for NULL return of get_submodule_ref_store()
45
+* ab/simplify-perl-makefile (2018-04-09) 2 commits
46
+ - SQUASH???
47
+ - perl: fix installing modules from contrib
48
38
- "git submodule status" misbehaved on a submodule that has been
39
- removed from the working tree.
49
+ Recent simplification of build procedure forgot a bit of tweak to
50
+ the build procedure of contrib/mw-to-git/
51
41
- Will cook in 'next'.
52
53
+* ak/bisect-doc-typofix (2018-04-07) 1 commit
54
+ - Documentation/git-bisect.txt: git bisect term → git bisect terms
55
44
-* lv/tls-1.3 (2018-03-29) 1 commit
45
- (merged to 'next' on 2018-03-30 at 4f13731408)
46
- + http: allow use of TLS 1.3
56
+ Docfix.
57
48
- When built with more recent cURL, GIT_SSL_VERSION can now specify
49
- "tlsv1.3" as its value.
58
+ Will merge to 'next'.
59
51
- Will cook in 'next'.
60
61
+* bw/commit-partial-from-subdirectory-fix (2018-04-05) 1 commit
62
+ - commit: allow partial commits with relative paths
63
54
-* nd/warn-more-for-devs (2018-03-29) 3 commits
55
- - Makefile: add EAGER_DEVELOPER mode
56
- - Makefile: detect compiler and enable more warnings in DEVELOPER=1
57
- - connect.c: mark die_initial_contact() NORETURN
64
+ "cd sub/dir && git commit ../path" ought to record the changes to
65
+ the file "sub/path", but this regressed long time ago.
66
59
- The build procedure "make DEVELOPER=YesPlease" learned to enable a
60
- bit more warning options depending on the compiler used to help
61
- developers more. There also is "make EAGER_DEVELOPER=YesPlease"
62
- available now, for those who want to help fixing warnings we
63
- usually ignore.
67
+ Will merge to 'next'.
68
+
69
+
70
+* ds/lazy-load-trees (2018-04-07) 5 commits
71
+ - commit-graph: lazy-load trees for commits
72
+ - treewide: replace maybe_tree with accessor methods
73
+ - commit: create get_commit_tree() method
74
+ - treewide: rename tree to maybe_tree
75
+ - Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
76
+ (this branch uses ds/commit-graph.)
77
+
78
+
79
+* jk/t5561-missing-curl (2018-04-05) 2 commits
80
+ - t5561: skip tests if curl is not available
81
+ - t5561: drop curl stderr redirects
82
+
83
+ Test fixes.
84
85
Will merge to 'next'.
86
87
68
-* sb/submodule-move-nested (2018-03-29) 6 commits
69
- - submodule: fixup nested submodules after moving the submodule
70
- - submodule-config: remove submodule_from_cache
71
- - submodule-config: add repository argument to submodule_from_{name, path}
72
- - submodule-config: allow submodule_free to handle arbitrary repositories
73
- - grep: remove "repo" arg from non-supporting funcs
74
- - submodule.h: drop declaration of connect_work_tree_and_git_dir
75
- (this branch uses nd/remove-ignore-env-field and sb/object-store; is tangled with sb/packfiles-in-repository.)
88
+* ks/branch-list-detached-rebase-i (2018-04-05) 2 commits
89
+ - t3200: verify "branch --list" sanity when rebasing from detached HEAD
90
+ - branch --list: print useful info whilst interactive rebasing a detached HEAD
91
77
- Moving a submodule that itself has submodule in it with "git mv"
78
- forgot to make necessary adjustment to the nested sub-submodules;
79
- now the codepath learned to recurse into the submodules.
92
+ "git branch --list" during an interrupted "rebase -i" now lets
93
+ users distinguish the case where a detached HEAD is being rebased
94
+ and a normal branch is being rebased.
95
96
+ Will merge to 'next'.
97
82
-* tb/config-type (2018-03-29) 1 commit
83
- - builtin/config.c: prefer `--type=bool` over `--bool`, etc.
84
- (this branch is used by tb/config-default.)
98
86
- The "git config" command uses separate options e.g. "--int",
87
- "--bool", etc. to specify what type the caller wants the value to
88
- be interpreted as. A new "--type=<typename>" option has been
89
- introduced, which would make it cleaner to define new types.
99
+* lw/daemon-log-destination (2018-04-09) 1 commit
100
+ - daemon.c: fix condition for redirecting stderr
101
+
102
+ Recent introduction of "--log-destination" option to "git daemon"
103
+ did not work well when the daemon was run under "--inetd" mode.
104
105
Will merge to 'next'.
106
107
94
-* tb/config-default (2018-03-29) 3 commits
95
- - builtin/config: introduce `color` type specifier
96
- - config.c: introduce 'git_config_color' to parse ANSI colors
97
- - builtin/config: introduce `--default`
98
- (this branch uses tb/config-type.)
108
+* mn/send-email-credential-doc (2018-04-08) 1 commit
109
+ - send-email: simplify Gmail example in the documentation
110
100
- "git config --get" learned the "--default" option, to help the
101
- calling script. Building on top of the tb/config-type topic, the
102
- "git config" learns "--type=color" type. Taken together, you can
103
- do things like "git config --get foo.color --default blue" and get
104
- the ANSI color sequence for the color given to foo.color variable,
105
- or "blue" if the variable does not exist.
111
+ Doc update.
112
113
+ Will merge to 'next'.
114
108
-* eb/cred-helper-ignore-sigpipe (2018-03-29) 1 commit
109
- (merged to 'next' on 2018-03-30 at c48e98c1b1)
110
- + credential: ignore SIGPIPE when writing to credential helpers
115
112
- When credential helper exits very quickly without reading its
113
- input, it used to cause Git to die with SIGPIPE, which has been
114
- fixed.
116
+* nd/worktree-move (2018-04-05) 1 commit
117
+ - t2028: tighten grep expression to make "move worktree" test more robust
118
+ (this branch is used by es/worktree-docs.)
119
116
- Will cook in 'next'.
120
+ Test update.
121
122
+ Will merge to 'next'.
123
119
-* jk/flockfile-stdio (2018-03-30) 1 commit
120
- - config: move flockfile() closer to unlocked functions
124
125
+* ab/git-svn-get-record-typofix (2018-04-09) 1 commit
126
+ - git-svn: avoid warning on undef readline()
127
123
-* jk/relative-directory-fix (2018-03-30) 5 commits
124
- - refs: use chdir_notify to update cached relative paths
125
- - set_work_tree: use chdir_notify
126
- - add chdir-notify API
127
- - trace.c: export trace_setup_key
128
- - set_git_dir: die when setenv() fails
128
+ "git svn" had a minor thinko/typo which has been fixed.
129
+
130
+
131
+* br/mergetools-guiffy (2018-04-06) 1 commit
132
+ - mergetools: add support for guiffy
133
+
134
+ "git mergetools" learned talking to guiffy.
135
+
136
+ Will merge to 'next'.
137
+
138
+
139
+* en/doc-typoes (2018-04-09) 2 commits
140
+ - Documentation: normalize spelling of 'normalised'
141
+ - Documentation: fix several one-character-off spelling errors
142
+
143
+ Docfix.
144
+
145
+ Will merge to 'next'.
146
+
147
+
148
+* hn/sort-ls-remote (2018-04-09) 1 commit
149
+ - ls-remote: create '--sort' option
150
+ (this branch uses jk/ref-array-push.)
151
+
152
+ "git ls-remote" learned an option to allow sorting its output based
153
+ on the refnames being shown.
154
+
155
+
156
+* jk/ref-array-push (2018-04-09) 3 commits
157
+ - ref-filter: factor ref_array pushing into its own function
158
+ - ref-filter: make ref_array_item allocation more consistent
159
+ - ref-filter: use "struct object_id" consistently
160
+ (this branch is used by hn/sort-ls-remote.)
161
+
162
+ API clean-up aournd ref-filter code.
163
+
164
+ Will merge to 'next'.
165
+
166
+
167
+* js/empty-config-section-fix (2018-04-06) 14 commits
168
+ - git_config_set: reuse empty sections
169
+ - git config --unset: remove empty sections (in the common case)
170
+ - git_config_set: make use of the config parser's event stream
171
+ - git_config_set: do not use a state machine
172
+ - config_set_store: rename some fields for consistency
173
+ - config: avoid using the global variable `store`
174
+ - config: introduce an optional event stream while parsing
175
+ - t1300: `--unset-all` can leave an empty section behind (bug)
176
+ - t1300: remove unreasonable expectation from TODO
177
+ - t1300: avoid relying on a bug
178
+ - config --replace-all: avoid extra line breaks
179
+ - t1300: demonstrate that --replace-all can "invent" newlines
180
+ - t1300: rename it to reflect that `repo-config` was deprecated
181
+ - git_config_set: fix off-by-two
182
+
183
+ "git config --unset a.b", when "a.b" is the last variable in an
184
+ otherwise empty section "a", left an empty section "a" behind, and
185
+ worse yet, a subsequent "git config a.c value" did not reuse that
186
+ empty shell and instead created a new one. These have been
187
+ (partially) corrected.
188
+
189
+ Reroll exists, which needs to be picked up.
190
+
191
+
192
+* js/t5404-path-fix (2018-04-09) 1 commit
193
+ - t5404: relax overzealous test
194
+
195
+ Test fix.
196
+
197
+ Will merge to 'next'.
198
+
199
+
200
+* ps/test-chmtime-get (2018-04-09) 1 commit
201
+ - t/helper: 'test-chmtime (--get|-g)' to print only the mtime
202
+
203
+ Test cleanup.
204
+
205
+ Will merge to 'next'.
206
+
207
+
208
+* es/fread-reads-dir-autoconf-fix (2018-04-09) 1 commit
209
+ - configure.ac: fix botched FREAD_READS_DIRECTORIES check
210
+
211
+ Small fix to the autoconf build procedure.
212
+
213
+ Will merge to 'next'.
214
+
215
+
216
+* es/worktree-docs (2018-04-09) 2 commits
217
+ - git-worktree.txt: unify command-line prompt in example blocks
218
+ - git-worktree.txt: recommend 'git worktree remove' over manual deletion
219
+ (this branch uses nd/worktree-move.)
220
+
221
+ Doc updates.
222
+
223
+ Will merge to 'next'.
224
225
--------------------------------------------------
226
[Stalled]
227
228
+* ld/p4-unshelve (2018-02-22) 1 commit
229
+ - git-p4: add unshelve command
230
+
231
+ "git p4" learned to "unshelve" shelved commit from P4.
232
+
233
+ Will hold, perhaps drop and use format-change that uses a proper "diff".
234
+ cf. <CAE5ih7_ooDMqVtTMoQ70s5XCkncr04HY0JkqSp1UmKQeG81oaA@mail.gmail.com>
235
+
236
+
237
* sb/blame-color (2018-02-13) 3 commits
238
- builtin/blame: highlight recently changed lines
239
- builtin/blame: add option to color metadata fields separately
@@ -213,6 +317,114 @@ of the repositories listed at
317
--------------------------------------------------
318
[Cooking]
319
320
+* rs/status-with-removed-submodule (2018-03-28) 1 commit
321
+ (merged to 'next' on 2018-03-30 at 8a7b618bc1)
322
+ + submodule: check for NULL return of get_submodule_ref_store()
323
+
324
+ "git submodule status" misbehaved on a submodule that has been
325
+ removed from the working tree.
326
+
327
+ Will merge to 'master'.
328
+
329
+
330
+* lv/tls-1.3 (2018-03-29) 1 commit
331
+ (merged to 'next' on 2018-03-30 at 4f13731408)
332
+ + http: allow use of TLS 1.3
333
+
334
+ When built with more recent cURL, GIT_SSL_VERSION can now specify
335
+ "tlsv1.3" as its value.
336
+
337
+ Will merge to 'master'.
338
+
339
+
340
+* nd/warn-more-for-devs (2018-03-29) 3 commits
341
+ - Makefile: add EAGER_DEVELOPER mode
342
+ - Makefile: detect compiler and enable more warnings in DEVELOPER=1
343
+ - connect.c: mark die_initial_contact() NORETURN
344
+
345
+ The build procedure "make DEVELOPER=YesPlease" learned to enable a
346
+ bit more warning options depending on the compiler used to help
347
+ developers more. There also is "make EAGER_DEVELOPER=YesPlease"
348
+ available now, for those who want to help fixing warnings we
349
+ usually ignore.
350
+
351
+ Will merge to 'next'.
352
+
353
+
354
+* sb/submodule-move-nested (2018-03-29) 6 commits
355
+ - submodule: fixup nested submodules after moving the submodule
356
+ - submodule-config: remove submodule_from_cache
357
+ - submodule-config: add repository argument to submodule_from_{name, path}
358
+ - submodule-config: allow submodule_free to handle arbitrary repositories
359
+ - grep: remove "repo" arg from non-supporting funcs
360
+ - submodule.h: drop declaration of connect_work_tree_and_git_dir
361
+ (this branch uses nd/remove-ignore-env-field and sb/object-store; is tangled with sb/packfiles-in-repository.)
362
+
363
+ Moving a submodule that itself has submodule in it with "git mv"
364
+ forgot to make necessary adjustment to the nested sub-submodules;
365
+ now the codepath learned to recurse into the submodules.
366
+
367
+
368
+* tb/config-type (2018-03-29) 1 commit
369
+ - builtin/config.c: prefer `--type=bool` over `--bool`, etc.
370
+ (this branch is used by tb/config-default.)
371
+
372
+ The "git config" command uses separate options e.g. "--int",
373
+ "--bool", etc. to specify what type the caller wants the value to
374
+ be interpreted as. A new "--type=<typename>" option has been
375
+ introduced, which would make it cleaner to define new types.
376
+
377
+ Will merge to 'next'.
378
+
379
+
380
+* tb/config-default (2018-03-29) 3 commits
381
+ - builtin/config: introduce `color` type specifier
382
+ - config.c: introduce 'git_config_color' to parse ANSI colors
383
+ - builtin/config: introduce `--default`
384
+ (this branch uses tb/config-type.)
385
+
386
+ "git config --get" learned the "--default" option, to help the
387
+ calling script. Building on top of the tb/config-type topic, the
388
+ "git config" learns "--type=color" type. Taken together, you can
389
+ do things like "git config --get foo.color --default blue" and get
390
+ the ANSI color sequence for the color given to foo.color variable,
391
+ or "blue" if the variable does not exist.
392
+
393
+
394
+* eb/cred-helper-ignore-sigpipe (2018-03-29) 1 commit
395
+ (merged to 'next' on 2018-03-30 at c48e98c1b1)
396
+ + credential: ignore SIGPIPE when writing to credential helpers
397
+
398
+ When credential helper exits very quickly without reading its
399
+ input, it used to cause Git to die with SIGPIPE, which has been
400
+ fixed.
401
+
402
+ Will merge to 'master'.
403
+
404
+
405
+* jk/flockfile-stdio (2018-03-30) 1 commit
406
+ - config: move flockfile() closer to unlocked functions
407
+
408
+ Code clean-up.
409
+
410
+ Will merge to 'next'.
411
+
412
+
413
+* jk/relative-directory-fix (2018-03-30) 5 commits
414
+ - refs: use chdir_notify to update cached relative paths
415
+ - set_work_tree: use chdir_notify
416
+ - add chdir-notify API
417
+ - trace.c: export trace_setup_key
418
+ - set_git_dir: die when setenv() fails
419
+
420
+ Some codepaths, including the refs API, get and keep relative
421
+ paths, that go out of sync when the process does chdir(2). The
422
+ chdir-notify API is introduced to let these codepaths adjust these
423
+ cached paths to the new current directory.
424
+
425
+ Will merge to 'next'.
426
+
427
+
428
* ds/bsearch-hash (2018-03-25) 4 commits
429
(merged to 'next' on 2018-03-29 at 561d5577a7)
430
+ sha1_name: use bsearch_pack() in unique_in_pack()
@@ -225,13 +437,13 @@ of the repositories listed at
437
on packfile content, which is a relatively recent addtion, has been
438
optimized to use the same fan-out table.
439
228
- Will cook in 'next'.
440
+ Will merge to 'master'.
441
442
443
* jh/json-writer (2018-03-28) 1 commit
444
- json_writer: new routines to create data in JSON format
445
234
- Is this ready for 'next'?
446
+ Will merge to 'next'.
447
448
449
* jk/diff-highlight-graph-fix (2018-03-21) 7 commits
@@ -247,7 +459,7 @@ of the repositories listed at
459
"diff-highlight" filter (in contrib/) learned to undertand "git log
460
--graph" output better.
461
250
- Will cook in 'next'.
462
+ Will merge to 'master'.
463
464
465
* ot/libify-get-ref-atom-value (2018-03-29) 6 commits
@@ -270,14 +482,14 @@ of the repositories listed at
482
483
Doc updates.
484
273
- Will cook in 'next'.
485
+ Will merge to 'master'.
486
487
488
* ab/drop-contrib-examples (2018-03-26) 1 commit
489
(merged to 'next' on 2018-03-29 at 9d8a7603b5)
490
+ Remove contrib/examples/*
491
280
- Will cook in 'next'.
492
+ Will merge to 'master'.
493
494
495
* bc/hash-independent-tests (2018-03-26) 10 commits
@@ -296,7 +508,7 @@ of the repositories listed at
508
Tests that rely on the exact hardcoded values of object names have
509
been updated in preparation for hash function migration.
510
299
- Will cook in 'next'.
511
+ Will merge to 'master'.
512
513
514
* cc/perf-aggregate-sort (2018-03-27) 2 commits
@@ -306,7 +518,7 @@ of the repositories listed at
518
519
Perf-test update.
520
309
- Will cook in 'next'.
521
+ Will merge to 'master'.
522
523
524
* jc/test-must-be-empty (2018-03-27) 1 commit
@@ -315,7 +527,7 @@ of the repositories listed at
527
528
Test helper update.
529
318
- Will cook in 'next'.
530
+ Will merge to 'master'.
531
532
533
* jk/branch-l-0-deprecation (2018-03-26) 3 commits
@@ -353,7 +565,8 @@ of the repositories listed at
565
Will keep in 'pu'.
566
567
356
-* jm/mem-pool (2018-03-27) 3 commits
568
+* jm/mem-pool (2018-03-30) 4 commits
569
+ - SQUASH??? fast-import: fix a sparse 'NULL pointer' warning
570
(merged to 'next' on 2018-03-29 at bfce05db6e)
571
+ Move reusable parts of memory pool into its own file
572
+ fast-import: introduce mem_pool type
@@ -363,7 +576,7 @@ of the repositories listed at
576
fast-import.c, which in turn has become the first user of the
577
mem-pool API.
578
366
- Will cook in 'next'.
579
+ Will kick back to 'pu' to be reworked.
580
581
582
* js/runtime-prefix-windows (2018-03-27) 2 commits
@@ -377,8 +590,9 @@ of the repositories listed at
590
other platforms, and its approach has been adopted back in the
591
Windows port.
592
380
- Is this, together with the dj/runtime-prefix topic, ready for
381
- 'next'?
593
+ Will merge to 'next'.
594
+ cf. <65a25131-9278-62c8-4d13-b8531209825d@kdbg.org>
595
+ cf. <nycvar.QRO.7.76.6.1804031511510.5026@qfpub.tvgsbejvaqbjf.bet>
596
597
598
* nd/combined-test-helper (2018-03-27) 36 commits
@@ -423,7 +637,7 @@ of the repositories listed at
637
Small test-helper programs have been consolidated into a single
638
binary.
639
426
- Will cook in 'next'.
640
+ Will merge to 'master'.
641
642
643
* nd/parseopt-completion-more (2018-03-25) 8 commits
@@ -440,7 +654,7 @@ of the repositories listed at
654
The mechanism to use parse-options API to automate the command line
655
completion continues to get extended and polished.
656
443
- Will cook in 'next'.
657
+ Will merge to 'master'.
658
659
660
* nd/trace-with-env (2018-03-25) 1 commit
@@ -449,7 +663,7 @@ of the repositories listed at
663
664
Code cleanup.
665
452
- Will cook in 'next'.
666
+ Will merge to 'master'.
667
668
669
* pk/test-avoid-pipe-hiding-exit-status (2018-03-28) 1 commit
@@ -458,7 +672,7 @@ of the repositories listed at
672
673
Test cleanup.
674
461
- Will cook in 'next'.
675
+ Will merge to 'master'.
676
677
678
* ws/rebase-p (2018-03-23) 8 commits
@@ -474,7 +688,7 @@ of the repositories listed at
688
689
Code clean-up.
690
477
- Will cook in 'next'.
691
+ Will merge to 'master'.
692
693
694
* yk/filter-branch-non-committish-refs (2018-03-25) 1 commit
@@ -485,7 +699,7 @@ of the repositories listed at
699
filter-branch" gave a misleading error messages. This has been
700
corrected.
701
488
- Will cook in 'next'.
702
+ Will merge to 'master'.
703
704
705
* ys/bisect-object-id-missing-conversion-fix (2018-03-25) 1 commit
@@ -494,7 +708,7 @@ of the repositories listed at
708
709
Code clean-up.
710
497
- Will cook in 'next'.
711
+ Will merge to 'master'.
712
713
714
* ml/filter-branch-no-op-error (2018-03-15) 1 commit
@@ -505,7 +719,7 @@ of the repositories listed at
719
the callers to tell the case where there was no new commits to
720
rewrite from other error cases.
721
508
- Will cook in 'next'.
722
+ Will merge to 'master'.
723
724
725
* ab/install-symlinks (2018-03-15) 3 commits
@@ -518,7 +732,7 @@ of the repositories listed at
732
(instead of hardlinks and copies) to install "git-foo" for built-in
733
commands, whose binaries are all identical.
734
521
- Will cook in 'next'.
735
+ Will merge to 'master'.
736
737
738
* tg/stash-untracked-with-pathspec-fix (2018-03-21) 4 commits
@@ -533,7 +747,7 @@ of the repositories listed at
747
error message when there was no tracked files that match the
748
<pathspec>, which has been fixed.
749
536
- Will cook in 'next'.
750
+ Will merge to 'master'.
751
752
753
* pw/rebase-keep-empty-fixes (2018-03-29) 3 commits
@@ -573,8 +787,7 @@ of the repositories listed at
787
way that has been possible on Windows for quite some time, for
788
Linux, BSDs and Darwin.
789
576
- Is this, together with the js/runtime-prefix-windows topic, ready
577
- for 'next'?
790
+ Will merge to 'next'.
791
792
793
* ti/fetch-everything-local-optim (2018-03-14) 1 commit
@@ -591,7 +804,7 @@ of the repositories listed at
804
cases, fetching into a repository with many loose objects from a
805
repository with small number of refs.
806
594
- Will cook in 'next'.
807
+ Will merge to 'master'.
808
809
810
* ab/nuke-emacs-contrib (2018-03-13) 1 commit
@@ -601,7 +814,11 @@ of the repositories listed at
814
The scripts in contrib/emacs/ have outlived their usefulness and
815
have been removed.
816
604
- Will cook in 'next'.
817
+ Will kick back to 'pu'.
818
+
819
+ There were some noises about better migration strategy that lets
820
+ git.el to nudge users to magit or something when used. Is it
821
+ something we want to pursue further?
822
823
824
* bc/object-id (2018-03-14) 36 commits
@@ -646,7 +863,7 @@ of the repositories listed at
863
864
Conversion from uchar[20] to struct object_id continues.
865
649
- Will cook in 'next'.
866
+ Will merge to 'master'.
867
868
869
* ma/shortlog-revparse (2018-03-15) 3 commits
@@ -660,7 +877,7 @@ of the repositories listed at
877
extra and unwanted arguments on its command line instead in such a
878
case.
879
663
- Will cook in 'next'.
880
+ Will merge to 'master'.
881
882
883
* ab/pcre-v2 (2018-03-14) 3 commits
@@ -675,7 +892,7 @@ of the repositories listed at
892
and USE_LIBPCRE2 can be used to explicitly choose which version to
893
use, as before.
894
678
- Will cook in 'next'.
895
+ Will merge to 'master'.
896
897
898
* bb/git-gui-ssh-key-files (2018-03-02) 2 commits
@@ -704,7 +921,8 @@ of the repositories listed at
921
the current theme.
922
923
707
-* nd/pack-objects-pack-struct (2018-03-26) 13 commits
924
+* nd/pack-objects-pack-struct (2018-04-02) 15 commits
925
+ - ci: exercise the whole test suite with uncommon code in pack-objects
926
- pack-objects: reorder members to shrink struct object_entry
927
- pack-objects: shrink delta_size field in struct object_entry
928
- pack-objects: shrink size field in struct object_entry
@@ -718,6 +936,7 @@ of the repositories listed at
936
- pack-objects: use bitfield for object_entry::dfs_state
937
- pack-objects: turn type and in_pack_type to bitfields
938
- pack-objects: a bit of document about struct object_entry
939
+ - t/README: mention about running the test suite in special modes
940
941
"git pack-objects" needs to allocate tons of "struct object_entry"
942
while doing its work, and shrinking its size helps the performance
@@ -753,7 +972,7 @@ of the repositories listed at
972
by assuming how "git worktree move" moves an existing worktree to a
973
different place.
974
756
- Will cook in 'next'.
975
+ Will merge to 'master'.
976
977
978
* pw/add-p-select (2018-03-16) 3 commits
@@ -766,16 +985,12 @@ of the repositories listed at
985
individual added/removed lines to be used in the operation, instead
986
of accepting or rejecting a whole hunk.
987
769
- Will cook in 'next'.
770
-
771
-
772
-* ld/p4-unshelve (2018-02-22) 1 commit
773
- - git-p4: add unshelve command
988
+ Will kick back to 'pu'.
989
775
- "git p4" learned to "unshelve" shelved commit from P4.
776
-
777
- Will hold, perhaps drop and use format-change that uses a proper "diff".
778
- cf. <CAE5ih7_ooDMqVtTMoQ70s5XCkncr04HY0JkqSp1UmKQeG81oaA@mail.gmail.com>
990
+ There was a brief discussion about this topic not doing as good a
991
+ job as it is advertised as---has it been resolved, or do we want to
992
+ run with what we have for now?
993
+ cf. <878ta8vyqe.fsf@evledraar.gmail.com>
994
995
996
* ps/contains-id-error-message (2018-03-22) 1 commit
@@ -785,7 +1000,7 @@ of the repositories listed at
1000
"git tag --contains no-such-commit" gave a full list of options
1001
after giving an error message.
1002
788
- Will cook in 'next'.
1003
+ Will merge to 'master'.
1004
1005
1006
* nd/remove-ignore-env-field (2018-03-23) 6 commits
@@ -801,7 +1016,7 @@ of the repositories listed at
1016
1017
Code clean-up for the "repository" abstraction.
1018
804
- Will cook in 'next'.
1019
+ Will merge to 'master'.
1020
1021
1022
* sb/object-store (2018-03-26) 27 commits
@@ -841,7 +1056,7 @@ of the repositories listed at
1056
Rerolled by Duy on top of a separate preliminary clean-up topic.
1057
The resulting structure of the topics looked very sensible.
1058
844
- Will cook in 'next'.
1059
+ Will merge to 'master'.
1060
1061
1062
* sb/packfiles-in-repository (2018-03-26) 12 commits
@@ -862,11 +1077,10 @@ of the repositories listed at
1077
1078
Refactoring of the internal global data structure continues.
1079
865
- Will cook in 'next'.
1080
+ Is this ready for 'master' by now?
1081
1082
868
-* ds/commit-graph (2018-03-14) 17 commits
869
- - SQUASH??? sparse fixes
1083
+* ds/commit-graph (2018-04-02) 16 commits
1084
- commit-graph: implement "--additive" option
1085
- commit-graph: build graph from starting commits
1086
- commit-graph: read only from specific pack-indexes
@@ -874,7 +1088,7 @@ of the repositories listed at
1088
- commit-graph: close under reachability
1089
- commit-graph: add core.commitGraph setting
1090
- commit-graph: implement git commit-graph read
877
- - commit-graph: implement 'git-commit-graph write'
1091
+ - commit-graph: implement git-commit-graph write
1092
- commit-graph: implement write_commit_graph()
1093
- commit-graph: create git-commit-graph builtin
1094
- graph: add commit graph design document
@@ -883,13 +1097,12 @@ of the repositories listed at
1097
- csum-file: rename hashclose() to finalize_hashfile()
1098
- Merge branch 'jk/cached-commit-buffer' into HEAD
1099
- Merge branch 'jt/binsearch-with-fanout' into HEAD
1100
+ (this branch is used by ds/lazy-load-trees.)
1101
1102
Precompute and store information necessary for ancestry traversal
1103
in a separate file to optimize graph walking.
1104
890
- Expecting a reroll.
891
- cf. <d76442f9-5f06-998b-8b2a-84b5ca118aaa@gmail.com>
892
- cf. <0c2f17fa-5c0e-9539-a081-7827a6678bf1@gmail.com>
1105
+ Ready???
1106
It seems that this topic is getting there.
1107
1108
@@ -904,17 +1117,18 @@ of the repositories listed at
1117
e.g. cf. <20180206150044.1bffbb573c088d38c8e44bf5@google.com>
1118
1119
907
-* tg/worktree-add-existing-branch (2018-03-27) 6 commits
908
- - t2025: rename now outdated branch name
1120
+* tg/worktree-add-existing-branch (2018-04-02) 6 commits
1121
- worktree: teach "add" to check out existing branches
1122
- worktree: factor out dwim_branch function
911
- - worktree: remove force_new_branch from struct add_opts
1123
- worktree: be clearer when "add" dwim-ery kicks in
1124
- worktree: improve message when creating a new worktree
1125
+ - reset: introduce show-new-head-line option
1126
+ - worktree: remove extra members from struct add_opts
1127
1128
"git worktree add" learned to check out an existing branch.
1129
917
- Is this ready for 'next'?
1130
+ Expecting a reroll.
1131
+ cf. <20180408143034.GK2629@hank> <20180408142417.GJ2629@hank>
1132
1133
1134
* js/rebase-recreate-merge (2018-02-23) 12 commits
@@ -979,7 +1193,7 @@ of the repositories listed at
1193
1194
The beginning of the next-gen transfer protocol.
1195
982
- Will cook in 'next'.
1196
+ Is this ready for 'master' by now?
1197
1198
1199
* ls/checkout-encoding (2018-03-16) 10 commits
@@ -1042,4 +1256,4 @@ of the repositories listed at
1256
to be overwritten during merge has also been fixed as part of this
1257
work.
1258
1045
- Will cook in 'next'.
1259
+ Will merge to 'master'.