What's cooking (2019/06 #07)
Junio C Hamano committed
Jun 28, 2019 at 15:12 UTC
a62bbae61827242ea11dff5bd4f1099eb4828cfa
1 file changed
+381
-336
whats-cooking.txt
+381
-336
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2019, #06; Wed, 26)
3
+Subject: What's cooking in git.git (Jun 2019, #07; Fri, 28)
4
X-master-at: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10
5
-X-next-at: ee2e6308ae95ce7ba2fabedcc43f5f741e71c152
5
+X-next-at: 81fc6c5d4a7fb145529da1dfc407c4e0c0e8ae8e
6
7
-What's cooking in git.git (Jun 2019, #06; Wed, 26)
7
+What's cooking in git.git (Jun 2019, #07; Fri, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -21,89 +21,181 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
24
-[Graduated to "master"]
24
+[New Topics]
25
26
-* ab/hash-object-doc (2019-05-28) 1 commit
27
- (merged to 'next' on 2019-06-06 at 8e4d85b906)
28
- + hash-object doc: stop mentioning git-cvsimport
26
+* cb/windows-manifest (2019-06-27) 1 commit
27
+ - mingw: embed a manifest to trick UAC into Doing The Right Thing
28
30
- Doc update.
29
+ Windows update.
30
+
31
+ Will merge to 'next'.
32
33
33
-* an/ignore-doc-update (2019-06-04) 1 commit
34
- (merged to 'next' on 2019-06-06 at 8579d82c0d)
35
- + gitignore.txt: make slash-rules more readable
34
+* js/mingw-gcc-stash-protect (2019-06-27) 1 commit
35
+ - mingw: enable stack smashing protector
36
37
- The description about slashes in gitignore patterns (used to
38
- indicate things like "anchored to this level only" and "only
39
- matches directories") has been revamped.
37
+ Windows update.
38
+
39
+ Will merge to 'next'.
40
41
42
-* cm/send-email-document-req-modules (2019-05-31) 1 commit
43
- (merged to 'next' on 2019-06-06 at acf1c2fc96)
44
- + send-email: update documentation of required Perl modules
42
+* js/mingw-use-utf8 (2019-06-27) 2 commits
43
+ - mingw: use Unicode functions explicitly
44
+ - mingw: get pw_name in UTF-8 format
45
46
- A doc update.
46
+ Windows update.
47
48
+ Will merge to 'next'.
49
49
-* jt/partial-clone-missing-ref-delta-base (2019-06-11) 4 commits
50
- (merged to 'next' on 2019-06-12 at 95628af9bb)
51
- + t5616: cover case of client having delta base
52
- + t5616: use correct flag to check object is missing
53
- (merged to 'next' on 2019-05-29 at 5d7573a151)
54
- + index-pack: prefetch missing REF_DELTA bases
55
- + t5616: refactor packfile replacement
50
57
- "git fetch" into a lazy clone forgot to fetch base objects that are
58
- necessary to complete delta in a thin packfile, which has been
59
- corrected.
51
+* kb/windows-force-utf8 (2019-06-27) 1 commit
52
+ - gettext: always use UTF-8 on native Windows
53
+
54
+ Windows update.
55
+
56
+ Will merge to 'next'.
57
+
58
+
59
+* js/rebase-reschedule-applies-only-to-interactive (2019-06-27) 1 commit
60
+ - rebase: ignore rebase.reschedulefailedexec unless interactive
61
+
62
+ The configuration variable rebase.rescheduleFailedExec should be
63
+ effective only while running an interactive rebase and should not
64
+ affect anything when running an non-interactive one, which was not
65
+ the case. This has been corrected.
66
+
67
+ Almost there, modulo minor nits.
68
+
69
70
62
-* md/list-objects-filter-memfix (2019-05-31) 1 commit
63
- (merged to 'next' on 2019-06-06 at 80f0187cef)
64
- + list-objects-filter: correct usage of ALLOC_GROW
71
+* jt/t5551-test-chunked (2019-06-27) 1 commit
72
+ - t5551: test usage of chunked encoding explicitly
73
66
- The filter_data used in the list-objects-filter (which manages a
67
- lazily sparse clone repository) did not use the dynamic array API
68
- correctly---'nr' is supposed to point at one past the last element
69
- of the array in use. This has been corrected.
74
+ Update smart-http test.
75
76
+ Will merge to 'next'.
77
+
78
+
79
+* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
80
+ - ref-filter.c: find disjoint pattern prefixes
81
+
82
+ "git for-each-ref" with multiple patterns have been optimized.
83
+
84
+ Will merge to 'next'.
85
72
-* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit
73
- (merged to 'next' on 2019-06-06 at 736f3c175b)
74
- + list-objects-filter-options: error is localizeable
86
76
- Make an end-user facing message localizable.
87
+* ew/repack-with-bitmaps-by-default (2019-06-28) 1 commit
88
+ - repack: disable bitmaps-by-default if .keep files exist
89
90
+ Generation of pack bitmaps are now disabled when .keep files exist,
91
+ as these are mutually exclusive features.
92
79
-* md/url-parse-harden (2019-06-04) 2 commits
80
- (merged to 'next' on 2019-06-06 at b187c3dbfe)
81
- + url: do not allow %00 to represent NUL in URLs
82
- + url: do not read past end of buffer
93
84
- The URL decoding code has been updated to avoid going past the end
85
- of the string while parsing %-<hex>-<hex> sequence.
94
+* jk/br-blame-ignore-unused-fix (2019-06-28) 1 commit
95
+ - blame: drop some unused function parameters
96
+ (this branch uses br/blame-ignore.)
97
98
+ Move this into the base topic, once acked.
99
88
-* ml/userdiff-rust (2019-05-30) 2 commits
89
- (merged to 'next' on 2019-06-12 at 33b88fa9e5)
90
- + userdiff: two simplifications of patterns for rust
91
- (merged to 'next' on 2019-05-19 at 1266fddce5)
92
- + userdiff: add built-in pattern for rust
100
94
- The pattern "git diff/grep" use to extract funcname and words
95
- boundary for Rust has been added.
101
+* jk/check-connected-with-alternates (2019-06-28) 1 commit
102
+ - check_connected: assume alternate ref tips are valid
103
104
+ The tips of refs from the alternate object store can be used as
105
+ starting point for reachability computation now.
106
+
107
+ Will merge to 'next'.
108
98
-* mo/clang-format-for-each-update (2019-06-04) 1 commit
99
- (merged to 'next' on 2019-06-06 at ee3066bb65)
100
- + clang-format: use git grep to generate the ForEachMacros list
109
102
- The list of for-each like macros used by clang-format has been
103
- updated.
110
+* jk/test-commit-bulk (2019-06-28) 6 commits
111
+ - t6200: use test_commit_bulk
112
+ - t5703: use test_commit_bulk
113
+ - t5702: use test_commit_bulk
114
+ - t3311: use test_commit_bulk
115
+ - t5310: increase the number of bitmapped commits
116
+ - test-lib: introduce test_commit_bulk
117
+
118
+ A test helper has been introduced to optimize preparation of test
119
+ repositories with many simple commits, and a handful of test
120
+ scripts have been updated to use it.
121
+
122
+ Will merge to 'next'.
123
+ I think I spotted one unused command, which we may want to remove, though.
124
125
--------------------------------------------------
106
-[New Topics]
126
+[Stalled]
127
+
128
+* jn/unknown-index-extensions (2018-11-21) 2 commits
129
+ - index: offer advice for unknown index extensions
130
+ - index: do not warn about unrecognized extensions
131
+
132
+ A bit too alarming warning given when unknown index extensions
133
+ exist is getting revamped.
134
+
135
+ Expecting a reroll.
136
+
137
+
138
+* jc/format-patch-delay-message-id (2019-04-05) 1 commit
139
+ - format-patch: move message-id and related headers to the end
140
+
141
+ The location "git format-patch --thread" adds the Message-Id:
142
+ header in the series of header fields has been moved down, which
143
+ may help working around a suspected bug in GMail MSA, reported at
144
+ <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
145
+
146
+ Waiting for feedback to see if it truly helps.
147
+ Needs tests.
148
+
149
+
150
+* jt/fetch-cdn-offload (2019-03-12) 9 commits
151
+ - SQUASH???
152
+ - upload-pack: send part of packfile response as uri
153
+ - fetch-pack: support more than one pack lockfile
154
+ - upload-pack: refactor reading of pack-objects out
155
+ - Documentation: add Packfile URIs design doc
156
+ - Documentation: order protocol v2 sections
157
+ - http-fetch: support fetching packfiles by URL
158
+ - http: improve documentation of http_pack_request
159
+ - http: use --stdin when getting dumb HTTP pack
160
+
161
+ WIP for allowing a response to "git fetch" to instruct the bulk of
162
+ the pack contents to be instead taken from elsewhere (aka CDN).
163
+
164
+ Stalled
165
+
166
+
167
+* js/protocol-advertise-multi (2018-12-28) 1 commit
168
+ - protocol: advertise multiple supported versions
169
+
170
+ The transport layer has been updated so that the protocol version
171
+ used can be negotiated between the parties, by the initiator
172
+ listing the protocol versions it is willing to talk, and the other
173
+ side choosing from one of them.
174
+
175
+ Expecting a reroll.
176
+ cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
177
+
178
+
179
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
180
+ - zlib.c: use size_t for size
181
+
182
+ The wrapper to call into zlib followed our long tradition to use
183
+ "unsigned long" for sizes of regions in memory, which have been
184
+ updated to use "size_t".
185
+
186
+
187
+* dl/remote-save-to-push (2018-12-11) 1 commit
188
+ - remote: add --save-to-push option to git remote set-url
189
+
190
+ "git remote set-url" learned a new option that moves existing value
191
+ of the URL field to pushURL field of the remote before replacing
192
+ the URL field with a new value.
193
+
194
+ Anybody who wants to champion this topic?
195
+ I am personally not yet quite convinced if this is worth pursuing.
196
+
197
+--------------------------------------------------
198
+[Cooking]
199
200
* ab/test-env (2019-06-21) 8 commits
201
- tests: make GIT_TEST_FAIL_PREREQS a boolean
@@ -123,11 +215,12 @@ of the repositories listed at
215
216
217
* cc/first-contrib-tutorial (2019-06-24) 1 commit
126
- - doc: improve usage string in MyFirstContribution
218
+ (merged to 'next' on 2019-06-27 at a9f2ab2f21)
219
+ + doc: improve usage string in MyFirstContribution
220
221
Update docs used in a tutorial.
222
130
- Will merge to 'next'.
223
+ Will merge to 'master'.
224
225
226
* ds/early-access (2019-06-20) 3 commits
@@ -138,79 +231,85 @@ of the repositories listed at
231
A mechanism to enable newish configuration settings in bulk has
232
been invented.
233
234
+ Looked mostly sane, modulo minor nits.
235
+
236
237
* jh/msvc (2019-06-25) 20 commits
143
- - msvc: ignore .dll and incremental compile output
144
- - msvc: avoid debug assertion windows in Debug Mode
145
- - msvc: do not pretend to support all signals
146
- - msvc: add pragmas for common warnings
147
- - msvc: add a compile-time flag to allow detailed heap debugging
148
- - msvc: support building Git using MS Visual C++
149
- - msvc: update Makefile to allow for spaces in the compiler path
150
- - msvc: fix detect_msys_tty()
151
- - msvc: define ftello()
152
- - msvc: do not re-declare the timespec struct
153
- - msvc: mark a variable as non-const
154
- - msvc: define O_ACCMODE
155
- - msvc: include sigset_t definition
156
- - msvc: fix dependencies of compat/msvc.c
157
- - mingw: replace mingw_startup() hack
158
- - obstack: fix compiler warning
159
- - cache-tree/blame: avoid reusing the DEBUG constant
160
- - t0001 (mingw): do not expect a specific order of stdout/stderr
161
- - Mark .bat files as requiring CR/LF endings
162
- - mingw: fix a typo in the msysGit-specific section
238
+ (merged to 'next' on 2019-06-27 at 5a16e3d67c)
239
+ + msvc: ignore .dll and incremental compile output
240
+ + msvc: avoid debug assertion windows in Debug Mode
241
+ + msvc: do not pretend to support all signals
242
+ + msvc: add pragmas for common warnings
243
+ + msvc: add a compile-time flag to allow detailed heap debugging
244
+ + msvc: support building Git using MS Visual C++
245
+ + msvc: update Makefile to allow for spaces in the compiler path
246
+ + msvc: fix detect_msys_tty()
247
+ + msvc: define ftello()
248
+ + msvc: do not re-declare the timespec struct
249
+ + msvc: mark a variable as non-const
250
+ + msvc: define O_ACCMODE
251
+ + msvc: include sigset_t definition
252
+ + msvc: fix dependencies of compat/msvc.c
253
+ + mingw: replace mingw_startup() hack
254
+ + obstack: fix compiler warning
255
+ + cache-tree/blame: avoid reusing the DEBUG constant
256
+ + t0001 (mingw): do not expect a specific order of stdout/stderr
257
+ + Mark .bat files as requiring CR/LF endings
258
+ + mingw: fix a typo in the msysGit-specific section
259
260
Support to build with MSVC has been updated.
261
166
- Will merge to 'next'.
262
+ Will merge to 'master'.
263
264
265
* jk/delta-islands-progress-fix (2019-06-20) 1 commit
170
- - delta-islands: respect progress flag
266
+ (merged to 'next' on 2019-06-27 at 644526ba73)
267
+ + delta-islands: respect progress flag
268
269
The codepath to compute delta islands used to spew progress output
270
without giving the callers any way to squelch it, which has been
271
fixed.
272
176
- Will merge to 'next'.
273
+ Will merge to 'master'.
274
275
276
* jk/oidhash (2019-06-20) 17 commits
180
- - hashmap: convert sha1hash() to oidhash()
181
- - hash.h: move object_id definition from cache.h
182
- - khash: rename oid helper functions
183
- - khash: drop sha1-specific map types
184
- - pack-bitmap: convert khash_sha1 maps into kh_oid_map
185
- - delta-islands: convert island_marks khash to use oids
186
- - khash: rename kh_oid_t to kh_oid_set
187
- - khash: drop broken oid_map typedef
188
- - object: convert create_object() to use object_id
189
- - object: convert internal hash_obj() to object_id
190
- - object: convert lookup_object() to use object_id
191
- - object: convert lookup_unknown_object() to use object_id
192
- - pack-objects: convert locate_object_entry_hash() to object_id
193
- - pack-objects: convert packlist_find() to use object_id
194
- - pack-bitmap-write: convert some helpers to use object_id
195
- - upload-pack: rename a "sha1" variable to "oid"
196
- - describe: fix accidental oid/hash type-punning
277
+ (merged to 'next' on 2019-06-27 at 7bf6b87738)
278
+ + hashmap: convert sha1hash() to oidhash()
279
+ + hash.h: move object_id definition from cache.h
280
+ + khash: rename oid helper functions
281
+ + khash: drop sha1-specific map types
282
+ + pack-bitmap: convert khash_sha1 maps into kh_oid_map
283
+ + delta-islands: convert island_marks khash to use oids
284
+ + khash: rename kh_oid_t to kh_oid_set
285
+ + khash: drop broken oid_map typedef
286
+ + object: convert create_object() to use object_id
287
+ + object: convert internal hash_obj() to object_id
288
+ + object: convert lookup_object() to use object_id
289
+ + object: convert lookup_unknown_object() to use object_id
290
+ + pack-objects: convert locate_object_entry_hash() to object_id
291
+ + pack-objects: convert packlist_find() to use object_id
292
+ + pack-bitmap-write: convert some helpers to use object_id
293
+ + upload-pack: rename a "sha1" variable to "oid"
294
+ + describe: fix accidental oid/hash type-punning
295
296
Code clean-up to remove hardcoded SHA-1 hash from manty places.
297
200
- Will merge to 'next'.
298
+ Will merge to 'master'.
299
300
301
* nd/fetch-capability-tweak (2019-06-20) 3 commits
204
- - fetch-pack: print server version at the top in -v -v
205
- - fetch-pack: print all relevant supported capabilities with -v -v
206
- - fetch-pack: move capability names out of i18n strings
302
+ (merged to 'next' on 2019-06-27 at dedbcb31a1)
303
+ + fetch-pack: print server version at the top in -v -v
304
+ + fetch-pack: print all relevant supported capabilities with -v -v
305
+ + fetch-pack: move capability names out of i18n strings
306
307
Protocol capabilities that go over wire should never be translated,
308
but it was incorrectly marked for translation, which has been
309
corrected. The output of protocol capabilities for debugging has
310
been tweaked a bit.
311
213
- Will merge to 'next'.
312
+ Will merge to 'master'.
313
314
315
* nd/index-dump-in-json (2019-06-26) 11 commits
@@ -229,66 +328,66 @@ of the repositories listed at
328
"ls-files" learned "--debug-json" option to dump the contents and
329
the extensions of the index file.
330
232
-
233
-* nd/switch-and-restore-more (2019-06-20) 2 commits
234
- - completion: disable dwim on "git switch -d"
235
- - switch: allow to switch in the middle of bisect
236
- (this branch is used by jl/status-reduce-vertical-blank; uses nd/switch-and-restore.)
237
-
238
- (this topic is just bits and pieces out of 4 patches)
331
+ At least the fixup at the tip needs to be squashed into the right
332
+ commit.
333
334
335
* rs/config-unit-parsing (2019-06-24) 3 commits
242
- - config: simplify parsing of unit factors
243
- - config: don't multiply in parse_unit_factor()
244
- - config: use unsigned_mult_overflows to check for overflows
336
+ (merged to 'next' on 2019-06-27 at db633f85fe)
337
+ + config: simplify parsing of unit factors
338
+ + config: don't multiply in parse_unit_factor()
339
+ + config: use unsigned_mult_overflows to check for overflows
340
(this branch uses js/gcc-8-and-9.)
341
342
The code to parse scaled numbers out of configuration files has
343
been made more robust and also easier to follow.
344
250
- Will merge to 'next'.
345
+ Will merge to 'master'.
346
347
348
* ab/fail-prereqs-in-test (2019-06-21) 1 commit
254
- - tests: mark two failing tests under FAIL_PREREQS
349
+ (merged to 'next' on 2019-06-27 at 4df04aa1a0)
350
+ + tests: mark two failing tests under FAIL_PREREQS
351
352
Test updates.
353
258
- Will merge to 'next'.
354
+ Will merge to 'master'.
355
356
357
* ds/fetch-disable-force-notice (2019-06-21) 3 commits
262
- - pull: add --[no-]show-forced-updates passthrough
263
- - fetch: warn about forced updates in branch listing
264
- - fetch: add --[no-]show-forced-updates argument
358
+ (merged to 'next' on 2019-06-27 at 3ff4516f85)
359
+ + pull: add --[no-]show-forced-updates passthrough
360
+ + fetch: warn about forced updates in branch listing
361
+ + fetch: add --[no-]show-forced-updates argument
362
363
"git fetch" and "git pull" reports when a fetch results in
364
non-fast-forward updates to let the user notice unusual situation.
365
The commands learned "--no-shown-forced-updates" option to disable
366
this safety feature.
367
271
- Will merge to 'next'.
368
+ Will merge to 'master'.
369
370
371
* jh/status-aheadbehind (2019-06-21) 3 commits
275
- - status: ignore status.aheadbehind in porcelain formats
276
- - status: warn when a/b calculation takes too long
277
- - status: add status.aheadbehind setting
372
+ (merged to 'next' on 2019-06-27 at 362ee6b059)
373
+ + status: ignore status.aheadbehind in porcelain formats
374
+ + status: warn when a/b calculation takes too long
375
+ + status: add status.aheadbehind setting
376
377
"git status" can be told a non-standard default value for the
378
"--[no-]ahead-behind" option with a new configuration variable
379
status.aheadBehind.
380
283
- Will merge to 'next'.
381
+ Will merge to 'master'.
382
383
384
* js/t0001-case-insensitive (2019-06-24) 1 commit
287
- - t0001: fix on case-insensitive filesystems
385
+ (merged to 'next' on 2019-06-27 at 6c0001aebb)
386
+ + t0001: fix on case-insensitive filesystems
387
388
Test update.
389
291
- Will merge to 'next'.
390
+ Will merge to 'master'.
391
392
393
* dr/progress-i18n (2019-06-24) 1 commit
@@ -300,24 +399,26 @@ of the repositories listed at
399
400
401
* jw/gitweb-sample-update (2019-06-24) 1 commit
303
- - doc: don't use git.kernel.org as example gitweb URL
402
+ (merged to 'next' on 2019-06-27 at 30a5e91e76)
403
+ + doc: don't use git.kernel.org as example gitweb URL
404
405
Doc update.
406
307
- Will merge to 'next'.
407
+ Will merge to 'master'.
408
409
410
* ms/submodule-foreach-fix (2019-06-25) 1 commit
311
- - submodule foreach: fix recursion of options
411
+ (merged to 'next' on 2019-06-27 at ccd37d4dac)
412
+ + submodule foreach: fix recursion of options
413
414
"git submodule foreach" did not protect command line options passed
415
to the command to be run in each submodule correctly, when the
416
"--recursive" option was in use.
417
317
- Will merge to 'next'.
418
+ Will merge to 'master'.
419
420
320
-* pw/status-with-corrupt-sequencer-state (2019-06-25) 3 commits
421
+* pw/status-with-corrupt-sequencer-state (2019-06-27) 3 commits
422
- status: do not report errors in sequencer/todo
423
- sequencer: factor out todo command name parsing
424
- sequencer: always allow tab after command name
@@ -326,23 +427,28 @@ of the repositories listed at
427
"git status" has been made more robust against a corrupt or stale
428
state files.
429
430
+ Will merge to 'next'.
431
+
432
433
* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit
331
- - t5551: use 'test_i18ngrep' to check translated output
434
+ (merged to 'next' on 2019-06-27 at 967c03da24)
435
+ + t5551: use 'test_i18ngrep' to check translated output
436
437
Test update.
438
335
- Will merge to 'next'.
439
+ Will merge to 'master'.
440
441
338
-* ab/no-kwset (2019-06-26) 7 commits
442
+* ab/no-kwset (2019-06-28) 9 commits
443
- grep: use PCRE v2 for optimized fixed-string search
444
- grep: remove the kwset optimization
445
- grep: drop support for \0 in --fixed-strings <pattern>
342
- - grep: make the behavior for \0 in patterns sane
446
+ - grep: make the behavior for NUL-byte in patterns sane
447
- grep tests: move binary pattern tests into their own file
448
- grep tests: move "grep binary" alongside the rest
449
- grep: inline the return value of a function call used only once
450
+ - grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
451
+ - log tests: test regex backends in "--encode=<enc>" tests
452
453
Retire use of kwset library, which is an optimization for looking
454
for fixed strings, with use of pcre2 JIT.
@@ -368,7 +474,8 @@ of the repositories listed at
474
Is this ready for 'next'?
475
476
371
-* nd/tree-walk-with-repo (2019-06-26) 6 commits
477
+* nd/tree-walk-with-repo (2019-06-28) 7 commits
478
+ - t7814: do not generate same commits in different repos
479
- Use the right 'struct repository' instead of the_repository
480
- match-trees.c: remove the_repo from shift_tree*()
481
- tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
@@ -380,88 +487,6 @@ of the repositories listed at
487
instance throughout more codepaths.
488
489
383
-* jh/trace2-sid-fix (2019-06-26) 1 commit
384
- - trace2: correct typo in technical documentation
385
-
386
- Typofix.
387
-
388
- Will merge to 'next'.
389
-
390
---------------------------------------------------
391
-[Stalled]
392
-
393
-* jn/unknown-index-extensions (2018-11-21) 2 commits
394
- - index: offer advice for unknown index extensions
395
- - index: do not warn about unrecognized extensions
396
-
397
- A bit too alarming warning given when unknown index extensions
398
- exist is getting revamped.
399
-
400
- Expecting a reroll.
401
-
402
-
403
-* jc/format-patch-delay-message-id (2019-04-05) 1 commit
404
- - format-patch: move message-id and related headers to the end
405
-
406
- The location "git format-patch --thread" adds the Message-Id:
407
- header in the series of header fields has been moved down, which
408
- may help working around a suspected bug in GMail MSA, reported at
409
- <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
410
-
411
- Waiting for feedback to see if it truly helps.
412
- Needs tests.
413
-
414
-
415
-* jt/fetch-cdn-offload (2019-03-12) 9 commits
416
- - SQUASH???
417
- - upload-pack: send part of packfile response as uri
418
- - fetch-pack: support more than one pack lockfile
419
- - upload-pack: refactor reading of pack-objects out
420
- - Documentation: add Packfile URIs design doc
421
- - Documentation: order protocol v2 sections
422
- - http-fetch: support fetching packfiles by URL
423
- - http: improve documentation of http_pack_request
424
- - http: use --stdin when getting dumb HTTP pack
425
-
426
- WIP for allowing a response to "git fetch" to instruct the bulk of
427
- the pack contents to be instead taken from elsewhere (aka CDN).
428
-
429
- Stalled
430
-
431
-
432
-* js/protocol-advertise-multi (2018-12-28) 1 commit
433
- - protocol: advertise multiple supported versions
434
-
435
- The transport layer has been updated so that the protocol version
436
- used can be negotiated between the parties, by the initiator
437
- listing the protocol versions it is willing to talk, and the other
438
- side choosing from one of them.
439
-
440
- Expecting a reroll.
441
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
442
-
443
-
444
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
445
- - zlib.c: use size_t for size
446
-
447
- The wrapper to call into zlib followed our long tradition to use
448
- "unsigned long" for sizes of regions in memory, which have been
449
- updated to use "size_t".
450
-
451
-
452
-* dl/remote-save-to-push (2018-12-11) 1 commit
453
- - remote: add --save-to-push option to git remote set-url
454
-
455
- "git remote set-url" learned a new option that moves existing value
456
- of the URL field to pushURL field of the remote before replacing
457
- the URL field with a new value.
458
-
459
- Anybody who wants to champion this topic?
460
- I am personally not yet quite convinced if this is worth pursuing.
461
-
462
---------------------------------------------------
463
-[Cooking]
464
-
490
* cb/fsmonitor-intfix (2019-06-17) 1 commit
491
(merged to 'next' on 2019-06-26 at bed7c7e78b)
492
+ fsmonitor: avoid signed integer overflow / infinite loop
@@ -472,16 +497,17 @@ of the repositories listed at
497
498
499
* es/rev-list-no-object-names (2019-06-20) 1 commit
475
- - rev-list: teach --no-object-names to enable piping
500
+ (merged to 'next' on 2019-06-27 at 6d95228e01)
501
+ + rev-list: teach --no-object-names to enable piping
502
503
"git rev-list --objects" learned with "--no-object-names" option to
504
squelch the path to the object that is used as a grouping hint for
505
pack-objects.
506
481
- Will merge to 'next'.
507
+ Will merge to 'master'.
508
509
484
-* md/list-objects-filter-combo (2019-06-17) 10 commits
510
+* md/list-objects-filter-combo (2019-06-28) 10 commits
511
- list-objects-filter-options: make parser void
512
- list-objects-filter-options: clean up use of ALLOC_GROW
513
- list-objects-filter-options: allow mult. --filter
@@ -491,12 +517,13 @@ of the repositories listed at
517
- list-objects-filter: implement composite filters
518
- list-objects-filter-options: always supply *errbuf
519
- list-objects-filter: put omits set in filter struct
494
- - list-objects-filter: make API easier to use
520
+ - list-objects-filter: encapsulate filter components
521
522
The list-objects-filter API (used to create a sparse/lazy clone)
523
learned to take a combined filter specification.
524
499
- Will merge to 'next'.
525
+ There is a bit of interaction with cc/multi-promisor topic, whose
526
+ conflict resolution I have no confidence in X-<.
527
528
529
* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
@@ -557,12 +584,13 @@ of the repositories listed at
584
585
586
* nd/fetch-multi-gc-once (2019-06-19) 1 commit
560
- - fetch: only run 'gc' once when fetching multiple remotes
587
+ (merged to 'next' on 2019-06-27 at 0225ada5e2)
588
+ + fetch: only run 'gc' once when fetching multiple remotes
589
590
"git fetch" that grabs from a group of remotes learned to run the
591
auto-gc only once at the very end.
592
565
- Will merge to 'next'.
593
+ Will merge to 'master'.
594
595
596
* ra/cherry-pick-revert-skip (2019-06-24) 6 commits
@@ -575,7 +603,7 @@ of the repositories listed at
603
604
"git cherry-pick/revert" learned a new "--skip" action.
605
578
- Is this one ready for 'next'?
606
+ Will merge to 'next'.
607
608
609
* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
@@ -589,15 +617,16 @@ of the repositories listed at
617
618
619
* js/gcc-8-and-9 (2019-06-13) 4 commits
592
- - config: avoid calling `labs()` on too-large data type
593
- - winansi: simplify loading the GetCurrentConsoleFontEx() function
594
- - kwset: allow building with GCC 8
595
- - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
620
+ (merged to 'next' on 2019-06-27 at 92bb0db3c7)
621
+ + config: avoid calling `labs()` on too-large data type
622
+ + winansi: simplify loading the GetCurrentConsoleFontEx() function
623
+ + kwset: allow building with GCC 8
624
+ + poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
625
(this branch is used by rs/config-unit-parsing.)
626
627
Code clean-up for new compilers.
628
600
- Will merge to 'next'.
629
+ Will merge to 'master'.
630
The 'kwset' one may get a wholesale replacement, either with new
631
version of kwset from upstream or removal of its users, but in the
632
meantime, it is probably OK to merge it down.
@@ -654,42 +683,45 @@ of the repositories listed at
683
684
685
* cc/test-oidmap (2019-06-17) 4 commits
657
- - test-hashmap: remove 'hash' command
658
- - oidmap: use sha1hash() instead of static hash() function
659
- - t: add t0016-oidmap.sh
660
- - t/helper: add test-oidmap.c
686
+ (merged to 'next' on 2019-06-27 at 247a4341ca)
687
+ + test-hashmap: remove 'hash' command
688
+ + oidmap: use sha1hash() instead of static hash() function
689
+ + t: add t0016-oidmap.sh
690
+ + t/helper: add test-oidmap.c
691
692
Extend the test coverage a bit.
693
664
- Will merge to 'next'.
694
+ Will merge to 'master'.
695
696
697
* ds/midx-expire-repack (2019-06-11) 11 commits
668
- - t5319-multi-pack-index.sh: test batch size zero
669
- - midx: add test that 'expire' respects .keep files
670
- - multi-pack-index: test expire while adding packs
671
- - midx: implement midx_repack()
672
- - multi-pack-index: prepare 'repack' subcommand
673
- - multi-pack-index: implement 'expire' subcommand
674
- - midx: refactor permutation logic and pack sorting
675
- - midx: simplify computation of pack name lengths
676
- - multi-pack-index: prepare for 'expire' subcommand
677
- - Docs: rearrange subcommands for multi-pack-index
678
- - repack: refactor pack deletion for future use
698
+ (merged to 'next' on 2019-06-27 at 35e6e3b38d)
699
+ + t5319-multi-pack-index.sh: test batch size zero
700
+ + midx: add test that 'expire' respects .keep files
701
+ + multi-pack-index: test expire while adding packs
702
+ + midx: implement midx_repack()
703
+ + multi-pack-index: prepare 'repack' subcommand
704
+ + multi-pack-index: implement 'expire' subcommand
705
+ + midx: refactor permutation logic and pack sorting
706
+ + midx: simplify computation of pack name lengths
707
+ + multi-pack-index: prepare for 'expire' subcommand
708
+ + Docs: rearrange subcommands for multi-pack-index
709
+ + repack: refactor pack deletion for future use
710
711
"git multi-pack-index" learned expire and repack subcommands.
712
682
- Will merge to 'next'.
713
+ Will merge to 'master'.
714
715
716
* md/sort-detached-head-first (2019-06-19) 1 commit
686
- - ref-filter: sort detached HEAD lines firstly
717
+ (merged to 'next' on 2019-06-27 at dc50dbe045)
718
+ + ref-filter: sort detached HEAD lines firstly
719
720
"git branch --list" learned to always output the detached HEAD as
721
the first item (when the HEAD is detached, of course), regardless
722
of the locale.
723
692
- Will merge to 'next'.
724
+ Will merge to 'master'.
725
726
727
* nd/completion-no-cache-failure (2019-06-12) 1 commit
@@ -703,20 +735,23 @@ of the repositories listed at
735
Will merge to 'master'.
736
737
706
-* sg/rebase-progress (2019-06-24) 5 commits
707
- - progress: use term_clear_line()
708
- - rebase: fix garbled progress display with '-x'
709
- - pager: add a helper function to clear the last line in the terminal
710
- - t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
711
- - t3404: modernize here doc style
738
+* sg/rebase-progress (2019-06-27) 5 commits
739
+ (merged to 'next' on 2019-06-27 at 425dd45c81)
740
+ + progress: use term_clear_line()
741
+ + rebase: fix garbled progress display with '-x'
742
+ + pager: add a helper function to clear the last line in the terminal
743
+ + t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
744
+ + t3404: modernize here doc style
745
746
Use "Erase in Line" CSI sequence that is already used in the editor
747
support to clear cruft in the progress output.
748
716
- Will merge to 'next'.
749
+ Will merge to 'master'.
750
751
719
-* sg/trace2-rename (2019-06-12) 1 commit
752
+* sg/trace2-rename (2019-06-27) 2 commits
753
+ (merged to 'next' on 2019-06-27 at 6e189bdb20)
754
+ + trace2: correct typo in technical documentation
755
(merged to 'next' on 2019-06-26 at 8ee228c455)
756
+ Revert "test-lib: whitelist GIT_TR2_* in the environment"
757
@@ -741,7 +776,7 @@ of the repositories listed at
776
777
* jl/status-reduce-vertical-blank (2019-06-21) 1 commit
778
- status: remove the empty line after hints
744
- (this branch uses nd/switch-and-restore and nd/switch-and-restore-more.)
779
+ (this branch uses nd/switch-and-restore.)
780
781
Extra blank lines in "git status" output have been reduced.
782
@@ -759,12 +794,13 @@ of the repositories listed at
794
795
796
* dl/includeif-onbranch (2019-06-05) 1 commit
762
- - config: learn the "onbranch:" includeIf condition
797
+ (merged to 'next' on 2019-06-27 at ef7250bbae)
798
+ + config: learn the "onbranch:" includeIf condition
799
800
The conditional inclusion mechanism learned to base the choice on
801
the branch the HEAD currently is on.
802
767
- Will merge to 'next'.
803
+ Will merge to 'master'.
804
805
806
* ds/commit-graph-incremental (2019-06-19) 18 commits
@@ -831,15 +867,16 @@ of the repositories listed at
867
868
869
* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
834
- - rebase --abort/--quit: cleanup refs/rewritten
835
- - sequencer: return errors from sequencer_remove_state()
836
- - rebase: warn if state directory cannot be removed
837
- - rebase: fix a memory leak
870
+ (merged to 'next' on 2019-06-27 at 97c9f12c4d)
871
+ + rebase --abort/--quit: cleanup refs/rewritten
872
+ + sequencer: return errors from sequencer_remove_state()
873
+ + rebase: warn if state directory cannot be removed
874
+ + rebase: fix a memory leak
875
876
"git rebase --abort" used to leave refs/rewritten/ when concluding
877
"git rebase -r", which has been corrected.
878
842
- Will merge to 'next'.
879
+ Will merge to 'master'.
880
cf. <2a37d4c2-6eec-548d-0bd0-12bbd49c8071@gmail.com>
881
882
@@ -878,53 +915,59 @@ of the repositories listed at
915
promisor remote and consult them in order when downloading missing
916
objects on demand.
917
881
-
882
-* nd/switch-and-restore (2019-06-20) 44 commits
883
- - t2027: use test_must_be_empty
884
- - Declare both git-switch and git-restore experimental
885
- - help: move git-diff and git-reset to different groups
886
- - doc: promote "git restore"
887
- - user-manual.txt: prefer 'merge --abort' over 'reset --hard'
888
- - completion: support restore
889
- - t: add tests for restore
890
- - restore: support --patch
891
- - restore: replace --force with --ignore-unmerged
892
- - restore: default to --source=HEAD when only --staged is specified
893
- - restore: reject invalid combinations with --staged
894
- - restore: add --worktree and --staged
895
- - checkout: factor out worktree checkout code
896
- - restore: disable overlay mode by default
897
- - restore: make pathspec mandatory
898
- - restore: take tree-ish from --source option instead
899
- - checkout: split part of it to new command 'restore'
900
- - doc: promote "git switch"
901
- - completion: support switch
902
- - t: add tests for switch
903
- - switch: make --orphan switch to an empty tree
904
- - switch: reject if some operation is in progress
905
- - switch: no worktree status unless real branch switch happens
906
- - switch: implicit dwim, use --no-guess to disable it
907
- - switch: add short option for --detach
908
- - switch: only allow explicit detached HEAD
909
- - switch: reject "do nothing" case
910
- - switch: stop accepting pathspec
911
- - switch: remove -l
912
- - switch: add --discard-changes
913
- - switch: better names for -b and -B
914
- - checkout: split part of it to new command 'switch'
915
- - checkout: split options[] array in three pieces
916
- - checkout: move 'confict_style' and 'dwim_..' to checkout_opts
917
- - checkout: make "opts" in cmd_checkout() a pointer
918
- - checkout: factor out some code in parse_branchname_arg()
919
- - checkout: keep most #include sorted
920
- - checkout: inform the user when removing branch state
921
- - checkout: advice how to get out of detached HEAD mode
922
- - t: rename t2014-switch.sh to t2014-checkout-switch.sh
923
- - git-checkout.txt: fix monospace typeset
924
- - doc: document --overwrite-ignore
925
- - git-checkout.txt: fix one syntax line
926
- - git-checkout.txt: spell out --no-option
927
- (this branch is used by jl/status-reduce-vertical-blank and nd/switch-and-restore-more.)
918
+ There is a bit of interaction with md/list-objects-filter-combo
919
+ topic, whose conflict resolution I have no confidence in X-<.
920
+
921
+
922
+* nd/switch-and-restore (2019-06-20) 46 commits
923
+ (merged to 'next' on 2019-06-27 at 85f83ad8d6)
924
+ + completion: disable dwim on "git switch -d"
925
+ + switch: allow to switch in the middle of bisect
926
+ + t2027: use test_must_be_empty
927
+ + Declare both git-switch and git-restore experimental
928
+ + help: move git-diff and git-reset to different groups
929
+ + doc: promote "git restore"
930
+ + user-manual.txt: prefer 'merge --abort' over 'reset --hard'
931
+ + completion: support restore
932
+ + t: add tests for restore
933
+ + restore: support --patch
934
+ + restore: replace --force with --ignore-unmerged
935
+ + restore: default to --source=HEAD when only --staged is specified
936
+ + restore: reject invalid combinations with --staged
937
+ + restore: add --worktree and --staged
938
+ + checkout: factor out worktree checkout code
939
+ + restore: disable overlay mode by default
940
+ + restore: make pathspec mandatory
941
+ + restore: take tree-ish from --source option instead
942
+ + checkout: split part of it to new command 'restore'
943
+ + doc: promote "git switch"
944
+ + completion: support switch
945
+ + t: add tests for switch
946
+ + switch: make --orphan switch to an empty tree
947
+ + switch: reject if some operation is in progress
948
+ + switch: no worktree status unless real branch switch happens
949
+ + switch: implicit dwim, use --no-guess to disable it
950
+ + switch: add short option for --detach
951
+ + switch: only allow explicit detached HEAD
952
+ + switch: reject "do nothing" case
953
+ + switch: stop accepting pathspec
954
+ + switch: remove -l
955
+ + switch: add --discard-changes
956
+ + switch: better names for -b and -B
957
+ + checkout: split part of it to new command 'switch'
958
+ + checkout: split options[] array in three pieces
959
+ + checkout: move 'confict_style' and 'dwim_..' to checkout_opts
960
+ + checkout: make "opts" in cmd_checkout() a pointer
961
+ + checkout: factor out some code in parse_branchname_arg()
962
+ + checkout: keep most #include sorted
963
+ + checkout: inform the user when removing branch state
964
+ + checkout: advice how to get out of detached HEAD mode
965
+ + t: rename t2014-switch.sh to t2014-checkout-switch.sh
966
+ + git-checkout.txt: fix monospace typeset
967
+ + doc: document --overwrite-ignore
968
+ + git-checkout.txt: fix one syntax line
969
+ + git-checkout.txt: spell out --no-option
970
+ (this branch is used by jl/status-reduce-vertical-blank.)
971
972
Two new commands "git switch" and "git restore" are introduced to
973
split "checking out a branch to work on advancing its history" and
@@ -932,7 +975,7 @@ of the repositories listed at
975
advancing the current history" out of the single "git checkout"
976
command.
977
935
- Will merge to 'next'.
978
+ Will merge to 'master'.
979
cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
980
cf. <20190425094600.15673-1-pclouds@gmail.com> (restore v3)
981
@@ -947,18 +990,19 @@ of the repositories listed at
990
991
992
* am/p4-branches-excludes (2019-04-02) 8 commits
950
- - git-p4: respect excluded paths when detecting branches
951
- - git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
952
- - git-p4: don't exclude other files with same prefix
953
- - git-p4: add failing test for "don't exclude other files with same prefix"
954
- - git-p4: don't groom exclude path list on every commit
955
- - git-p4: match branches case insensitively if configured
956
- - git-p4: add failing test for "git-p4: match branches case insensitively if configured"
957
- - git-p4: detect/prevent infinite loop in gitCommitByP4Change()
993
+ (merged to 'next' on 2019-06-27 at 5b4fb87c45)
994
+ + git-p4: respect excluded paths when detecting branches
995
+ + git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
996
+ + git-p4: don't exclude other files with same prefix
997
+ + git-p4: add failing test for "don't exclude other files with same prefix"
998
+ + git-p4: don't groom exclude path list on every commit
999
+ + git-p4: match branches case insensitively if configured
1000
+ + git-p4: add failing test for "git-p4: match branches case insensitively if configured"
1001
+ + git-p4: detect/prevent infinite loop in gitCommitByP4Change()
1002
1003
"git p4" update.
1004
961
- Will merge to 'next'.
1005
+ Will merge to 'master'.
1006
1007
1008
* dl/rebase-i-keep-base (2019-04-25) 6 commits
@@ -1003,18 +1047,19 @@ of the repositories listed at
1047
1048
1049
* br/blame-ignore (2019-06-20) 9 commits
1006
- - blame: add a test to cover blame_coalesce()
1007
- - blame: use the fingerprint heuristic to match ignored lines
1008
- - blame: add a fingerprint heuristic to match ignored lines
1009
- - blame: optionally track line fingerprints during fill_blame_origin()
1010
- - blame: add config options for the output of ignored or unblamable lines
1011
- - blame: add the ability to ignore commits and their changes
1012
- - blame: use a helper function in blame_chunk()
1013
- - Move oidset_parse_file() to oidset.c
1014
- - fsck: rename and touch up init_skiplist()
1050
+ (merged to 'next' on 2019-06-27 at 36b91a787f)
1051
+ + blame: add a test to cover blame_coalesce()
1052
+ + blame: use the fingerprint heuristic to match ignored lines
1053
+ + blame: add a fingerprint heuristic to match ignored lines
1054
+ + blame: optionally track line fingerprints during fill_blame_origin()
1055
+ + blame: add config options for the output of ignored or unblamable lines
1056
+ + blame: add the ability to ignore commits and their changes
1057
+ + blame: use a helper function in blame_chunk()
1058
+ + Move oidset_parse_file() to oidset.c
1059
+ + fsck: rename and touch up init_skiplist()
1060
+ (this branch is used by jk/br-blame-ignore-unused-fix.)
1061
1062
"git blame" learned to "ignore" commits in the history, whose
1063
effects (as well as their presence) get ignored.
1064
1019
- Will merge to 'next'.
1020
- cf. <20190620163820.231316-1-brho@google.com> (v9)
1065
+ Needs a touch-up to reduce -Wunused-parameters error.