What's cooking (2019/08 #03)
Junio C Hamano committed
Aug 6, 2019 at 14:57 UTC
47972ae489c25f94da01ad88ad3a5f41c7ce6314
1 file changed
+117
-109
whats-cooking.txt
+117
-109
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2019, #02; Fri, 2)
3
+Subject: What's cooking in git.git (Aug 2019, #03; Tue, 6)
4
X-master-at: 7c20df84bd21ec0215358381844274fa10515017
5
X-next-at: deed80330f2f849fecaf1d22eaf715b93ef96954
6
7
-What's cooking in git.git (Aug 2019, #02; Fri, 2)
7
+What's cooking in git.git (Aug 2019, #03; Tue, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,95 +12,113 @@ 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
-The first release candidate for 2.23 has been tagged. "git log"
16
-will by default honor the ".mailmap" file like "git shortlog" does,
17
-which is a backward-incompatible change that is shipped without big
18
-fanfare.
15
+There are a few last-minute fix-up topics in flight, which I'll be
16
+merging to 'next' and then down to 'master' soonish, before rc2.
17
+They are marked as "Will merge to 'next' and then to 'master'" in
18
+this report; please raise hand if some of them are not ready or
19
+appropriate, to stop me before too late.
20
21
You can find the changes described here in the integration branches
22
of the repositories listed at
23
24
http://git-blame.blogspot.com/p/git-public-repositories.html
25
25
---------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* jc/log-mailmap-flip-defaults (2019-08-02) 2 commits
29
- - log: really flip the --mailmap default
30
- (merged to 'next' on 2019-08-01 at 80cddd7895)
31
- + log: flip the --mailmap default unconditionally
32
-
33
- Hotfix for making "git log" use the mailmap by default.
34
-
35
-
36
-* js/early-config-with-onbranch (2019-07-31) 1 commit
37
- (merged to 'next' on 2019-08-01 at 26b713c824)
38
- + config: work around bug with includeif:onbranch and early config
39
-
40
- The recently added [includeif "onbranch:branch"] feature does not
41
- work well with an early config mechanism, as it attempts to find
42
- out what branch we are on before we even haven't located the git
43
- repository. The inclusion during early config scan is ignored to
44
- work around this issue.
45
-
46
-
47
-* js/visual-studio (2019-07-29) 23 commits
48
- + git: avoid calling aliased builtins via their dashed form
49
- + bin-wrappers: append `.exe` to target paths if necessary
50
- + .gitignore: ignore Visual Studio's temporary/generated files
51
- + .gitignore: touch up the entries regarding Visual Studio
52
- + vcxproj: also link-or-copy builtins
53
- + msvc: add a Makefile target to pre-generate the Visual Studio solution
54
- + contrib/buildsystems: add a backend for modern Visual Studio versions
55
- + contrib/buildsystems: handle options starting with a slash
56
- + contrib/buildsystems: also handle -lexpat
57
- + contrib/buildsystems: handle libiconv, too
58
- + contrib/buildsystems: handle the curl library option
59
- + contrib/buildsystems: error out on unknown option
60
- + contrib/buildsystems: optionally capture the dry-run in a file
61
- + contrib/buildsystems: redirect errors of the dry run into a log file
62
- + contrib/buildsystems: ignore gettext stuff
63
- + contrib/buildsystems: handle quoted spaces in filenames
64
- + contrib/buildsystems: fix misleading error message
65
- + contrib/buildsystems: ignore irrelevant files in Generators/
66
- + contrib/buildsystems: ignore invalidcontinue.obj
67
- + Vcproj.pm: urlencode '<' and '>' when generating VC projects
68
- + Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool
69
- + Vcproj.pm: list git.exe first to be startup project
70
- + Vcproj.pm: auto-generate GUIDs
71
-
72
- Support building Git with Visual Studio
73
-
74
- The bits about .git/branches/* have been dropped from the series.
75
- We may want to drop the support for it, but until that happens, the
76
- tests should rely on the existence of the support to pass.
77
-
78
-
79
-* sg/fsck-config-in-doc (2019-07-29) 1 commit
80
- + Documentation/git-fsck.txt: include fsck.* config variables
81
-
82
- Doc update.
83
-
26
--------------------------------------------------
27
[New Topics]
28
87
-* cb/pcre2-chartables-leakfix (2019-08-02) 1 commit
88
- - grep: avoid leak of chartables in PCRE2
29
+* ds/commit-graph-octopus-fix (2019-08-05) 1 commit
30
+ - commit-graph: fix bug around octopus merges
31
32
+ commit-graph did not handle commits with more than two parents
33
+ correctly, which has been corrected.
34
91
-* jh/trace2-pretty-output (2019-08-01) 3 commits
92
- - trace2: trim whitespace in region messages in perf target format
93
- - trace2: trim whitespace in start message in perf target format
94
- - trace2: cleanup column alignment in perf target format
35
+ Will merge to 'next' and then to 'master'.
36
37
97
-* sc/pack-refs-deletion-racefix (2019-08-02) 1 commit
98
- - pack-refs: always refresh after taking the lock file
38
+* mr/doc-can-not-to-cannot (2019-08-05) 1 commit
39
+ - doc: typo: s/can not/cannot/ and s/is does/does/
40
41
+ Docfix.
42
101
-* vn/restore-empty-ita-corner-case-fix (2019-08-02) 2 commits
102
- - restore: add test for deleted ita files
103
- - checkout.c: unstage empty deleted ita files
43
+ Will merge to 'next' and then to 'master'.
44
+
45
+
46
+* nd/switch-and-restore (2019-08-05) 1 commit
47
+ - restore: fix typo in docs
48
+
49
+ Docfix.
50
+
51
+ Will merge to 'next' and then to 'master'.
52
+
53
+
54
+* sg/commit-graph-validate (2019-08-05) 3 commits
55
+ - commit-graph: error out on invalid commit oids in 'write --stdin-commits'
56
+ - commit-graph: turn a group of write-related macro flags into an enum
57
+ - t5318-commit-graph: use 'test_expect_code'
58
+
59
+ The code to write commit-graph over given commit object names has
60
+ been made a bit more robust.
61
+
62
+ Will merge to 'next'.
63
+
64
+
65
+* sg/show-failed-test-names (2019-08-05) 2 commits
66
+ - tests: show the test name and number at the start of verbose output
67
+ - t0000-basic: use realistic test script names in the verbose tests
68
+
69
+ The first line of verbose output from each test piece now carries
70
+ the test name and number to help scanning with eyeballs.
71
+
72
+ Will merge to 'next'.
73
+
74
+
75
+* en/disable-dir-rename-in-recursive-merge (2019-08-06) 1 commit
76
+ - merge-recursive: avoid directory rename detection in recursive case
77
+
78
+ "merge-recursive" hit a BUG() when building a virtual merge base
79
+ detected a directory rename.
80
+
81
+ Will merge to 'next' and then to 'master'.
82
+
83
+
84
+* js/pre-merge-commit-hook (2019-08-06) 4 commits
85
+ - merge: --no-verify to bypass pre-merge-commit hook
86
+ - git-merge: honor pre-merge-commit hook
87
+ - merge: do no-verify like commit
88
+ - t7503: verify proper hook execution
89
+
90
+ A new "pre-merge-commit" hook has been introduced.
91
+
92
+
93
+* ja/l10n-fixes (2019-08-06) 1 commit
94
+ - l10n: reformat some localized strings for v2.23.0
95
+
96
+ A few messages have been updated to help localization better.
97
+
98
+ Will merge to 'next' and then to 'master'.
99
+
100
+
101
+* jk/eoo (2019-08-06) 3 commits
102
+ - gitcli: document --end-of-options
103
+ - parse-options: allow --end-of-options as a synonym for "--"
104
+ - revision: allow --end-of-options to end option parsing
105
+
106
+ The command line parser learned "--end-of-options" notation; the
107
+ standard convention for scripters to have hardcoded set of options
108
+ first on the command line, and force the command to treat end-user
109
+ input as non-options, has been to use "--" as the delimiter, but
110
+ that would not work for commands that use "--" as a delimiter
111
+ between revs and pathspec.
112
+
113
+ Will merge to 'next'.
114
+
115
+
116
+* jk/repo-init-cleanup (2019-08-06) 3 commits
117
+ - config: stop checking whether the_repository is NULL
118
+ - common-main: delay trace2 initialization
119
+ - t1309: use short branch name in includeIf.onbranch test
120
+
121
+ Further clean-up of the initialization code.
122
123
--------------------------------------------------
124
[Stalled]
@@ -175,6 +193,29 @@ of the repositories listed at
193
--------------------------------------------------
194
[Cooking]
195
196
+* cb/pcre2-chartables-leakfix (2019-08-06) 3 commits
197
+ - grep: avoid leak of chartables in PCRE2
198
+ - grep: make PCRE2 aware of custom allocator
199
+ - grep: make PCRE1 aware of custom allocator
200
+
201
+ WIP.
202
+
203
+
204
+* jh/trace2-pretty-output (2019-08-01) 3 commits
205
+ - trace2: trim whitespace in region messages in perf target format
206
+ - trace2: trim whitespace in start message in perf target format
207
+ - trace2: cleanup column alignment in perf target format
208
+
209
+
210
+* sc/pack-refs-deletion-racefix (2019-08-02) 1 commit
211
+ - pack-refs: always refresh after taking the lock file
212
+
213
+
214
+* vn/restore-empty-ita-corner-case-fix (2019-08-02) 2 commits
215
+ - restore: add test for deleted ita files
216
+ - checkout.c: unstage empty deleted ita files
217
+
218
+
219
* ds/feature-macros (2019-07-30) 5 commits
220
- repo-settings: create feature.experimental setting
221
- repo-settings: create feature.manyFiles setting
@@ -410,36 +451,3 @@ of the repositories listed at
451
On hold.
452
cf. <20190508001252.15752-1-avarab@gmail.com>
453
cf. <20190719210156.GA9688@archbookpro.localdomain>
413
-
414
---------------------------------------------------
415
-[Discarded]
416
-
417
-* nd/index-dump-in-json (2019-06-26) 11 commits
418
- . SQUASH???
419
- . t3008: use the new SINGLE_CPU prereq
420
- . read-cache.c: dump "IEOT" extension as json
421
- . read-cache.c: dump "EOIE" extension as json
422
- . resolve-undo.c: dump "REUC" extension as json
423
- . fsmonitor.c: dump "FSMN" extension as json
424
- . split-index.c: dump "link" extension as json
425
- . dir.c: dump "UNTR" extension as json
426
- . cache-tree.c: dump "TREE" extension as json
427
- . read-cache.c: dump common extension info in json
428
- . ls-files: add --json to dump the index
429
-
430
- "ls-files" learned "--debug-json" option to dump the contents and
431
- the extensions of the index file.
432
-
433
- Retracted at least for now.
434
- cf. <CACsJy8A8fJZq6k2i_e0EpkxN8SZ4+8h1FA0eV6e9xFLaMDcsPg@mail.gmail.com>
435
-
436
-
437
-* ds/early-access (2019-07-01) 3 commits
438
- . repo-settings: pack.useSparse=true
439
- . repo-settings: use index.version=4 by default
440
- . repo-settings: create core.featureAdoptionRate setting
441
-
442
- A mechanism to enable newish configuration settings in bulk has
443
- been invented.
444
-
445
- ds/feature-macros has replaced this topic.