What's cooking (2019/08 #01)
Junio C Hamano committed
Aug 1, 2019 at 13:03 UTC
e47bcdf8d57fe78bab1ca5c39d28fe4514dfe8e7
1 file changed
+168
-99
whats-cooking.txt
+168
-99
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2019, #07; Mon, 29)
4
-X-master-at: 026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8
5
-X-next-at: 4dedae46a21fbd9d3232915177485ac88f42884f
3
+Subject: What's cooking in git.git (Aug 2019, #01; Thu, 1)
4
+X-master-at: 51cf315870bbb7254ddf06c84fe03b41bc48eebd
5
+X-next-at: 66108df07cb19d083b2ca07a23f4bf494216042f
6
7
-What's cooking in git.git (Jul 2019, #07; Mon, 29)
7
+What's cooking in git.git (Aug 2019, #01; Thu, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,6 @@ 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 preview for 2.23 has been tagged.
16
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -22,61 +20,148 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
25
-* bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit
26
- (merged to 'next' on 2019-07-23 at 8bd5a68618)
27
- + grep: print the pcre2_jit_on value
23
+* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
24
+ (merged to 'next' on 2019-07-29 at d1efaea0ec)
25
+ + t2203: avoid hard-coded object ID values
26
+ + t1710: make hash independent
27
+ + t1007: remove SHA1 prerequisites
28
+ + t0090: make test pass with SHA-256
29
+ + t0027: make hash size independent
30
+ + t6030: make test work with SHA-256
31
+ + t5000: make hash independent
32
+ + t1450: make hash size independent
33
+ + t1410: make hash size independent
34
+ + t: add helper to convert object IDs to paths
35
29
- BUG() message fix.
36
+ Update to the tests to help SHA-256 transition continues.
37
31
- The codepath may want to just simply be removed, though.
38
39
+* cb/xdiff-no-system-includes-in-dot-c (2019-07-28) 3 commits
40
+ (merged to 'next' on 2019-07-29 at 35ea0d8cba)
41
+ + xdiff: remove duplicate headers from xpatience.c
42
+ + xdiff: remove duplicate headers from xhistogram.c
43
+ + xdiff: drop system includes in xutils.c
44
+ (this branch uses jk/no-system-includes-in-dot-c.)
45
+
46
+ Compilation fix.
47
+
48
+
49
+* jc/dir-iterator-test-fix (2019-07-30) 1 commit
50
+ (merged to 'next' on 2019-07-31 at 8637ae9f34)
51
+ + test-dir-iterator: do not assume errno values
52
+
53
+ Test fix.
54
34
-* jk/xdiff-clamp-funcname-context-index (2019-07-23) 1 commit
35
- (merged to 'next' on 2019-07-25 at b2944a0ba6)
36
- + xdiff: clamp function context indices in post-image
55
38
- The internal diff machinery can be made to read out of bounds while
39
- looking for --funcion-context line in a corner case, which has been
40
- corrected.
56
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
57
+ (merged to 'next' on 2019-07-29 at 8081b8c13d)
58
+ + wt-status.h: drop stdio.h include
59
+ + verify-tag: drop signal.h include
60
+ (this branch is used by cb/xdiff-no-system-includes-in-dot-c.)
61
+
62
+ Compilation fix.
63
+
64
65
+* jk/repack-silence-auto-bitmap-warning (2019-07-31) 3 commits
66
+ (merged to 'next' on 2019-07-31 at 3aa218347c)
67
+ + repack: simplify handling of auto-bitmaps and .keep files
68
+ + repack: silence warnings when auto-enabled bitmaps cannot be built
69
+ + t7700: clean up .keep file in bitmap-writing test
70
43
-* js/rebase-cleanup (2019-07-25) 2 commits
44
- (merged to 'next' on 2019-07-25 at 3d9cedf470)
45
- + git: mark cmd_rebase as requiring a worktree
46
- + rebase: fix white-space
71
+ Squelch unneeded and misleading warnings from "repack" when the
72
+ command attempts to generate pack bitmaps without explicitly asked
73
+ for by the user.
74
48
- A few leftover cleanup to "git rebase" in C.
75
76
+* jk/sort-iter-test-output (2019-07-31) 1 commit
77
+ (merged to 'next' on 2019-07-31 at 449695af8f)
78
+ + t: sort output of hashmap iteration
79
51
-* sg/travis-gcc-4.8 (2019-07-19) 1 commit
52
- (merged to 'next' on 2019-07-25 at e3d546eb15)
53
- + travis-ci: build with GCC 4.8 as well
80
+ Test fix.
81
55
- Add a job to build with a tad older GCC to make sure we are still
56
- buildable.
82
83
--------------------------------------------------
59
-[Stalled]
84
+[New Topics]
85
61
-* nd/index-dump-in-json (2019-06-26) 11 commits
62
- - SQUASH???
63
- - t3008: use the new SINGLE_CPU prereq
64
- - read-cache.c: dump "IEOT" extension as json
65
- - read-cache.c: dump "EOIE" extension as json
66
- - resolve-undo.c: dump "REUC" extension as json
67
- - fsmonitor.c: dump "FSMN" extension as json
68
- - split-index.c: dump "link" extension as json
69
- - dir.c: dump "UNTR" extension as json
70
- - cache-tree.c: dump "TREE" extension as json
71
- - read-cache.c: dump common extension info in json
72
- - ls-files: add --json to dump the index
86
+* ds/feature-macros (2019-07-30) 5 commits
87
+ - repo-settings: create feature.experimental setting
88
+ - repo-settings: create feature.manyFiles setting
89
+ - repo-settings: parse core.untrackedCache
90
+ - repo-settings: add feature.manyCommits setting
91
+ - repo-settings: consolidate some config settings
92
74
- "ls-files" learned "--debug-json" option to dump the contents and
75
- the extensions of the index file.
93
77
- At least the fixup at the tip needs to be squashed into the right
78
- commit. Also the new test seems flaky.
94
+* mt/grep-submodules-working-tree (2019-07-30) 1 commit
95
+ - grep: fix worktree case in submodules
96
+
97
+ "git grep --recurse-submodules" that looks at the working tree
98
+ files looked at the contents in the index in submodules, instead of
99
+ files in the working tree.
100
+
101
+ Will merge to 'next'.
102
+
103
+
104
+* sg/fsck-config-in-doc (2019-07-29) 1 commit
105
+ - Documentation/git-fsck.txt: include fsck.* config variables
106
+
107
+ Doc update.
108
+
109
+ Will merge to 'next'.
110
+
111
+
112
+* jk/tree-walk-overflow (2019-07-31) 6 commits
113
+ - tree-walk: harden make_traverse_path() length computations
114
+ - tree-walk: add a strbuf wrapper for make_traverse_path()
115
+ - tree-walk: accept a raw length for traverse_path_len()
116
+ - tree-walk: use size_t consistently
117
+ - tree-walk: drop oid from traverse_info
118
+ - setup_traverse_info(): stop copying oid
119
+
120
+ Codepaths to walk tree objects have been audited for integer
121
+ overflows and hardened.
122
+
123
+ Will merge to 'next'.
124
+
125
+
126
+* js/early-config-with-onbranch (2019-07-31) 1 commit
127
+ (merged to 'next' on 2019-08-01 at 26b713c824)
128
+ + config: work around bug with includeif:onbranch and early config
129
+
130
+ The recently added [includeif "onbranch:branch"] feature does not
131
+ work well with an early config mechanism, as it attempts to find
132
+ out what branch we are on before we even haven't located the git
133
+ repository. The inclusion during early config scan is ignored to
134
+ work around this issue.
135
+
136
+ Will merge to 'master'.
137
+
138
+
139
+* jc/log-mailmap-flip-defaults (2019-08-01) 1 commit
140
+ (merged to 'next' on 2019-08-01 at 80cddd7895)
141
+ + log: flip the --mailmap default unconditionally
142
+
143
+
144
+* sg/t5510-test-i18ngrep-fix (2019-07-31) 1 commit
145
+ - t5510-fetch: fix negated 'test_i18ngrep' invocation
146
+ (this branch is used by sg/do-not-skip-non-httpd-tests.)
147
+
148
+ Test fix.
149
+
150
+ Will merge to 'next'.
151
+
152
+
153
+* sg/do-not-skip-non-httpd-tests (2019-08-01) 3 commits
154
+ - tests: warn against appending non-httpd-specific tests at the end
155
+ - t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
156
+ - t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
157
+ (this branch uses sg/t5510-test-i18ngrep-fix.)
158
+
159
+ Test fix.
160
161
+ Will merge to 'next'.
162
+
163
+--------------------------------------------------
164
+[Stalled]
165
166
* jn/unknown-index-extensions (2018-11-21) 2 commits
167
- index: offer advice for unknown index extensions
@@ -157,28 +242,6 @@ of the repositories listed at
242
Expecting a reroll.
243
244
160
-* cb/xdiff-no-system-includes-in-dot-c (2019-07-28) 3 commits
161
- (merged to 'next' on 2019-07-29 at 35ea0d8cba)
162
- + xdiff: remove duplicate headers from xpatience.c
163
- + xdiff: remove duplicate headers from xhistogram.c
164
- + xdiff: drop system includes in xutils.c
165
- (this branch uses jk/no-system-includes-in-dot-c.)
166
-
167
- Compilation fix.
168
-
169
- Will merge to 'master'.
170
-
171
-
172
-* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
173
- (merged to 'next' on 2019-07-29 at 8081b8c13d)
174
- + wt-status.h: drop stdio.h include
175
- + verify-tag: drop signal.h include
176
- (this branch is used by cb/xdiff-no-system-includes-in-dot-c.)
177
-
178
- Compilation fix.
179
-
180
- Will merge to 'master'.
181
-
245
* ra/rebase-i-more-options (2019-07-23) 4 commits
246
- SQUASH???
247
- rebase -i: support --committer-date-is-author-date
@@ -191,12 +254,11 @@ of the repositories listed at
254
Needs a bit of fixups, at least.
255
256
194
-* js/rebase-r-strategy (2019-07-25) 12 commits
257
+* js/rebase-r-strategy (2019-07-31) 16 commits
258
- rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
259
- t3418: test `rebase -r` with merge strategies
260
- t/lib-rebase: prepare for testing `git rebase --rebase-merges`
261
- rebase -r: support merge strategies other than `recursive`
199
- - t3427: mark two test cases as requiring support for `git rebase -p`
262
- t3427: fix another incorrect assumption
263
- t3427: accommodate for the `rebase --merge` backend having been replaced
264
- t3427: fix erroneous assumption
@@ -204,6 +266,11 @@ of the repositories listed at
266
- t3427: move the `filter-branch` invocation into the `setup` case
267
- t3427: simplify the `setup` test case significantly
268
- t3427: add a clarifying comment
269
+ - rebase: fold git-rebase--common into the -p backend
270
+ - sequencer: the `am` and `rebase--interactive` scripts are gone
271
+ - .gitignore: there is no longer a built-in `git-rebase--interactive`
272
+ - t3400: stop referring to the scripted rebase
273
+ - Drop unused git-rebase--am.sh
274
275
"git rebase --rebase-merges" learned to drive different merge
276
strategies and pass strategy specific options to them.
@@ -268,43 +335,12 @@ of the repositories listed at
335
tests should rely on the existence of the support to pass.
336
337
271
-* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
272
- (merged to 'next' on 2019-07-29 at d1efaea0ec)
273
- + t2203: avoid hard-coded object ID values
274
- + t1710: make hash independent
275
- + t1007: remove SHA1 prerequisites
276
- + t0090: make test pass with SHA-256
277
- + t0027: make hash size independent
278
- + t6030: make test work with SHA-256
279
- + t5000: make hash independent
280
- + t1450: make hash size independent
281
- + t1410: make hash size independent
282
- + t: add helper to convert object IDs to paths
283
-
284
- Update to the tests to help SHA-256 transition continues.
285
-
286
- Will merge to 'master'.
287
-
288
-
338
* es/walken-tutorial (2019-07-02) 1 commit
339
- documentation: add tutorial for revision walking
340
341
Yet another revision walker tutorial.
342
343
295
-* ds/early-access (2019-07-01) 3 commits
296
- - repo-settings: pack.useSparse=true
297
- - repo-settings: use index.version=4 by default
298
- - repo-settings: create core.featureAdoptionRate setting
299
-
300
- A mechanism to enable newish configuration settings in bulk has
301
- been invented.
302
-
303
- Will replace with a redesigned variant which is being discussed
304
- when the dust settles.
305
- cf. <pull.292.v2.git.gitgitgadget@gmail.com> (v2)
306
-
307
-
344
* ab/no-kwset (2019-07-01) 10 commits
345
(merged to 'next' on 2019-07-15 at ed0479ce3d)
346
+ grep: use PCRE v2 for optimized fixed-string search
@@ -408,3 +444,36 @@ of the repositories listed at
444
On hold.
445
cf. <20190508001252.15752-1-avarab@gmail.com>
446
cf. <20190719210156.GA9688@archbookpro.localdomain>
447
+
448
+--------------------------------------------------
449
+[Discarded]
450
+
451
+* nd/index-dump-in-json (2019-06-26) 11 commits
452
+ . SQUASH???
453
+ . t3008: use the new SINGLE_CPU prereq
454
+ . read-cache.c: dump "IEOT" extension as json
455
+ . read-cache.c: dump "EOIE" extension as json
456
+ . resolve-undo.c: dump "REUC" extension as json
457
+ . fsmonitor.c: dump "FSMN" extension as json
458
+ . split-index.c: dump "link" extension as json
459
+ . dir.c: dump "UNTR" extension as json
460
+ . cache-tree.c: dump "TREE" extension as json
461
+ . read-cache.c: dump common extension info in json
462
+ . ls-files: add --json to dump the index
463
+
464
+ "ls-files" learned "--debug-json" option to dump the contents and
465
+ the extensions of the index file.
466
+
467
+ Retracted at least for now.
468
+ cf. <CACsJy8A8fJZq6k2i_e0EpkxN8SZ4+8h1FA0eV6e9xFLaMDcsPg@mail.gmail.com>
469
+
470
+
471
+* ds/early-access (2019-07-01) 3 commits
472
+ . repo-settings: pack.useSparse=true
473
+ . repo-settings: use index.version=4 by default
474
+ . repo-settings: create core.featureAdoptionRate setting
475
+
476
+ A mechanism to enable newish configuration settings in bulk has
477
+ been invented.
478
+
479
+ ds/feature-macros has replaced this topic.