What's cooking (2019/07 #05)
Junio C Hamano committed
Jul 19, 2019 at 13:09 UTC
d605740b68cbdcabca122774f8090c64b16b3f2e
1 file changed
+297
-317
whats-cooking.txt
+297
-317
@@ -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, #04; Thu, 18)
4
-X-master-at: 9d418600f4d10dcbbfb0b5fdbc71d509e03ba719
5
-X-next-at: 960e92d24f97b83a5afe35e978f7537ea42a72ec
3
+Subject: What's cooking in git.git (Jul 2019, #05; Fri, 19)
4
+X-master-at: 9c9b961d7eb15fb583a2a812088713a68a85f1c0
5
+X-next-at: 102302147b47505b8667bbd7a42e242728b3a860
6
7
-What's cooking in git.git (Jul 2019, #04; Thu, 18)
7
+What's cooking in git.git (Jul 2019, #05; Fri, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,141 +12,203 @@ 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 sixth batch is in and the 'next' branch has thinned down quite a
16
+bit.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
21
-[New Topics]
24
+[Graduated to "master"]
25
23
-* ac/log-use-mailmap-by-default-transition (2019-07-15) 3 commits
24
- - tests: defang pager tests by explicitly disabling the log.mailmap warning
25
- - documentation: mention --no-use-mailmap and log.mailmap false setting
26
- - log: add warning for unspecified log.mailmap setting
26
+* br/blame-ignore (2019-07-01) 11 commits
27
+ (merged to 'next' on 2019-07-01 at f4b79421c9)
28
+ + t8014: remove unnecessary braces
29
+ + blame: drop some unused function parameters
30
+ (merged to 'next' on 2019-06-27 at 36b91a787f)
31
+ + blame: add a test to cover blame_coalesce()
32
+ + blame: use the fingerprint heuristic to match ignored lines
33
+ + blame: add a fingerprint heuristic to match ignored lines
34
+ + blame: optionally track line fingerprints during fill_blame_origin()
35
+ + blame: add config options for the output of ignored or unblamable lines
36
+ + blame: add the ability to ignore commits and their changes
37
+ + blame: use a helper function in blame_chunk()
38
+ + Move oidset_parse_file() to oidset.c
39
+ + fsck: rename and touch up init_skiplist()
40
28
- The "git log" command learns to issue a warning when log.mailmap
29
- configuration is not set and --[no-]mailmap option is not used, to
30
- prepare users for future versions of Git that uses the mailmap by
31
- default.
41
+ "git blame" learned to "ignore" commits in the history, whose
42
+ effects (as well as their presence) get ignored.
43
33
- Will merge to 'next'.
44
45
+* cc/test-oidmap (2019-07-01) 6 commits
46
+ (merged to 'next' on 2019-07-01 at 331a414a24)
47
+ + t0016: add 'remove' subcommand test
48
+ + test-oidmap: remove 'add' subcommand
49
+ (merged to 'next' on 2019-06-27 at 247a4341ca)
50
+ + test-hashmap: remove 'hash' command
51
+ + oidmap: use sha1hash() instead of static hash() function
52
+ + t: add t0016-oidmap.sh
53
+ + t/helper: add test-oidmap.c
54
36
-* vn/xmmap-gently (2019-07-14) 1 commit
37
- - read-cache.c: do not die if mmap fails
55
+ Extend the test coverage a bit.
56
39
- Clean-up an error codepath.
57
41
- Will merge to 'next'.
58
+* ds/commit-graph-incremental (2019-06-19) 18 commits
59
+ (merged to 'next' on 2019-07-03 at 5dee5edbdf)
60
+ + commit-graph: test verify across alternates
61
+ + commit-graph: normalize commit-graph filenames
62
+ + commit-graph: test --split across alternate without --split
63
+ + commit-graph: test octopus merges with --split
64
+ + commit-graph: clean up chains after flattened write
65
+ + commit-graph: verify chains with --shallow mode
66
+ + commit-graph: create options for split files
67
+ + commit-graph: expire commit-graph files
68
+ + commit-graph: allow cross-alternate chains
69
+ + commit-graph: merge commit-graph chains
70
+ + commit-graph: add --split option to builtin
71
+ + commit-graph: write commit-graph chains
72
+ + commit-graph: rearrange chunk count logic
73
+ + commit-graph: add base graphs chunk
74
+ + commit-graph: load commit-graph chains
75
+ + commit-graph: rename commit_compare to oid_compare
76
+ + commit-graph: prepare for commit-graph chains
77
+ + commit-graph: document commit-graph chains
78
79
+ The commits in a repository can be described by multiple
80
+ commit-graph files now, which allows the commit-graph files to be
81
+ updated incrementally.
82
44
-* jc/post-c89-rules-doc (2019-07-18) 1 commit
45
- - CodingGuidelines: spell out post-C89 rules
83
47
- We have been trying out a few language features outside c89; the
48
- coding guidelines document did not talk about them and instead had
49
- a blanket ban against them.
84
+* ds/midx-expire-repack (2019-07-01) 12 commits
85
+ (merged to 'next' on 2019-07-01 at c2a907f395)
86
+ + t5319: use 'test-tool path-utils' instead of 'ls -l'
87
+ (merged to 'next' on 2019-06-27 at 35e6e3b38d)
88
+ + t5319-multi-pack-index.sh: test batch size zero
89
+ + midx: add test that 'expire' respects .keep files
90
+ + multi-pack-index: test expire while adding packs
91
+ + midx: implement midx_repack()
92
+ + multi-pack-index: prepare 'repack' subcommand
93
+ + multi-pack-index: implement 'expire' subcommand
94
+ + midx: refactor permutation logic and pack sorting
95
+ + midx: simplify computation of pack name lengths
96
+ + multi-pack-index: prepare for 'expire' subcommand
97
+ + Docs: rearrange subcommands for multi-pack-index
98
+ + repack: refactor pack deletion for future use
99
51
- Will merge to 'next'.
100
+ "git multi-pack-index" learned expire and repack subcommands.
101
102
54
-* js/mingw-spawn-with-spaces-in-path (2019-07-16) 1 commit
55
- - mingw: support spawning programs containing spaces in their names
103
+* ea/merge-code-cleanup (2019-07-09) 1 commit
104
+ (merged to 'next' on 2019-07-11 at a7b831b03e)
105
+ + builtin/merge.c - cleanup of code in for-cycle that tests strategies
106
57
- Window 7 update ;-)
107
+ A loop has been rewritten for conciseness and clarity.
108
59
- Will merge to 'next'.
109
110
+* ew/repack-with-bitmaps-by-default (2019-07-01) 1 commit
111
+ (merged to 'next' on 2019-07-09 at 985419cb6e)
112
+ + repack: disable bitmaps-by-default if .keep files exist
113
62
-* sr/gpg-interface-stop-at-the-end (2019-07-16) 1 commit
63
- - gpg-interface: do not scan past the end of buffer
114
+ Generation of pack bitmaps are now disabled when .keep files exist,
115
+ as these are mutually exclusive features.
116
65
- A codepath that reads from GPG for signed object verification read
66
- past the end of allocated buffer, which has been fixed.
117
68
- Will merge to 'next'.
118
+* jk/check-connected-with-alternates (2019-07-01) 2 commits
119
+ (merged to 'next' on 2019-07-09 at b5888bd955)
120
+ + check_everything_connected: assume alternate ref tips are valid
121
+ + object-store.h: move for_each_alternate_ref() from transport.h
122
123
+ The tips of refs from the alternate object store can be used as
124
+ starting point for reachability computation now.
125
71
-* tg/stash-keep-index-with-removed-paths (2019-07-16) 1 commit
72
- - stash: fix handling removed files with --keep-index
126
74
- "git stash --keep-index" did not work correctly on paths that have
75
- been removed, which has been fixed.
127
+* jl/status-reduce-vertical-blank (2019-06-21) 1 commit
128
+ (merged to 'next' on 2019-07-11 at 5716f37348)
129
+ + status: remove the empty line after hints
130
77
- Will merge to 'next'.
131
+ Extra blank lines in "git status" output have been reduced.
132
133
80
-* jc/denoise-rm-to-resolve (2019-07-18) 1 commit
81
- - rm: resolving by removal is not a warning-worthy event
134
+* js/trace2-signo-typofix (2019-07-09) 1 commit
135
+ (merged to 'next' on 2019-07-11 at b2d2029b90)
136
+ + trace2: correct trace2 field name documentation
137
83
- "git rm" to resolve a conflicted path leaked an internal message
84
- "needs merge" before actually removing the path, which was
85
- confusing. This has been corrected.
138
+ Documentation fix.
139
87
- Will merge to 'next'.
140
141
+* kb/mingw-set-home (2019-07-08) 1 commit
142
+ (merged to 'next' on 2019-07-11 at 51c7e23dab)
143
+ + mingw: initialize HOME on startup
144
90
-* js/clean-report-too-long-a-path (2019-07-18) 1 commit
91
- - clean: show an error message when the path is too long
145
+ Windows port update.
146
93
- "git clean" silently skipped a path when it cannot lstat() it; now
94
- it gives a warning.
147
96
- Will merge to 'next'.
148
+* ma/ref-filter-leakfix (2019-07-10) 1 commit
149
+ (merged to 'next' on 2019-07-11 at a7a4bb81ac)
150
+ + ref-filter: fix memory leak in `free_array_item()`
151
152
+ Leakfix.
153
99
-* di/readme-markup-fix (2019-07-18) 1 commit
100
- - README: fix rendering of text in angle brackets
154
102
- Docfix.
155
+* nd/tree-walk-with-repo (2019-06-28) 7 commits
156
+ (merged to 'next' on 2019-07-09 at 3e613f977c)
157
+ + t7814: do not generate same commits in different repos
158
+ + Use the right 'struct repository' instead of the_repository
159
+ + match-trees.c: remove the_repo from shift_tree*()
160
+ + tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
161
+ + tree-walk.c: remove the_repo from get_tree_entry()
162
+ + tree-walk.c: remove the_repo from fill_tree_descriptor()
163
+ + sha1-file.c: remove the_repo from read_object_with_reference()
164
104
- Will merge to 'next'.
165
+ The tree-walk API learned to pass an in-core repository
166
+ instance throughout more codepaths.
167
168
107
-* js/builtin-add-i (2019-07-18) 11 commits
108
- - built-in add -i: implement the `help` command
109
- - built-in add -i: use color in the main loop
110
- - built-in add -i: support `?` (prompt help)
111
- - built-in add -i: show unique prefixes of the commands
112
- - Add a function to determine unique prefixes for a list of strings
113
- - built-in add -i: implement the main loop
114
- - built-in add -i: color the header in the `status` command
115
- - built-in add -i: refresh the index before running `status`
116
- - built-in add -i: implement the `status` command
117
- - diff: export diffstat interface
118
- - Start to implement a built-in version of `git add --interactive`
169
+* pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit
170
+ (merged to 'next' on 2019-07-09 at bf8f0af685)
171
+ + git-prompt: improve cherry-pick/revert detection
172
120
- The beginning of rewriting "git add -i" in C.
173
+ When one step in multi step cherry-pick or revert is reset or
174
+ committed, the command line prompt script failed to notice the
175
+ current status, which has been improved.
176
177
123
-* js/visual-studio (2019-07-18) 24 commits
124
- - git: avoid calling aliased builtins via their dashed form
125
- - t5505,t5516: create .git/branches/ when needed
126
- - bin-wrappers: append `.exe` to target paths if necessary
127
- - .gitignore: ignore Visual Studio's temporary/generated files
128
- - .gitignore: touch up the entries regarding Visual Studio
129
- - vcxproj: also link-or-copy builtins
130
- - msvc: add a Makefile target to pre-generate the Visual Studio solution
131
- - contrib/buildsystems: add a backend for modern Visual Studio versions
132
- - contrib/buildsystems: handle options starting with a slash
133
- - contrib/buildsystems: also handle -lexpat
134
- - contrib/buildsystems: handle libiconv, too
135
- - contrib/buildsystems: handle the curl library option
136
- - contrib/buildsystems: error out on unknown option
137
- - contrib/buildsystems: optionally capture the dry-run in a file
138
- - contrib/buildsystems: redirect errors of the dry run into a log file
139
- - contrib/buildsystems: ignore gettext stuff
140
- - contrib/buildsystems: handle quoted spaces in filenames
141
- - contrib/buildsystems: fix misleading error message
142
- - contrib/buildsystems: ignore irrelevant files in Generators/
143
- - contrib/buildsystems: ignore invalidcontinue.obj
144
- - Vcproj.pm: urlencode '<' and '>' when generating VC projects
145
- - Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool
146
- - Vcproj.pm: list git.exe first to be startup project
147
- - Vcproj.pm: auto-generate GUIDs
178
+* pw/rebase-progress-test-cleanup (2019-07-08) 1 commit
179
+ (merged to 'next' on 2019-07-11 at 1363de0fe2)
180
+ + t3420: remove progress lines before comparing output
181
+
182
+ Test cleanup.
183
149
- Support building Git with Visual Studio
184
+
185
+* pw/status-with-corrupt-sequencer-state (2019-06-27) 3 commits
186
+ (merged to 'next' on 2019-07-03 at 273aee6b3c)
187
+ + status: do not report errors in sequencer/todo
188
+ + sequencer: factor out todo command name parsing
189
+ + sequencer: always allow tab after command name
190
+
191
+ The code to read state files used by the sequencer machinery for
192
+ "git status" has been made more robust against a corrupt or stale
193
+ state files.
194
+
195
+
196
+* ra/cherry-pick-revert-skip (2019-07-02) 5 commits
197
+ (merged to 'next' on 2019-07-09 at 4ffa502220)
198
+ + cherry-pick/revert: advise using --skip
199
+ + cherry-pick/revert: add --skip option
200
+ + sequencer: use argv_array in reset_merge
201
+ + sequencer: rename reset_for_rollback to reset_merge
202
+ + sequencer: add advice for revert
203
+
204
+ "git cherry-pick/revert" learned a new "--skip" action.
205
+
206
+
207
+* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
208
+ (merged to 'next' on 2019-07-03 at f59ad42c4a)
209
+ + ref-filter.c: find disjoint pattern prefixes
210
+
211
+ "git for-each-ref" with multiple patterns have been optimized.
212
213
--------------------------------------------------
214
[Stalled]
@@ -243,22 +305,142 @@ of the repositories listed at
305
--------------------------------------------------
306
[Cooking]
307
246
-* js/trace2-signo-typofix (2019-07-09) 1 commit
247
- (merged to 'next' on 2019-07-11 at b2d2029b90)
248
- + trace2: correct trace2 field name documentation
308
+* ac/log-use-mailmap-by-default-transition (2019-07-15) 3 commits
309
+ (merged to 'next' on 2019-07-19 at e5669de950)
310
+ + tests: defang pager tests by explicitly disabling the log.mailmap warning
311
+ + documentation: mention --no-use-mailmap and log.mailmap false setting
312
+ + log: add warning for unspecified log.mailmap setting
313
+
314
+ The "git log" command learns to issue a warning when log.mailmap
315
+ configuration is not set and --[no-]mailmap option is not used, to
316
+ prepare users for future versions of Git that uses the mailmap by
317
+ default.
318
+
319
+ Will merge to 'master'.
320
+
321
+
322
+* vn/xmmap-gently (2019-07-14) 1 commit
323
+ (merged to 'next' on 2019-07-19 at d95c1d2be3)
324
+ + read-cache.c: do not die if mmap fails
325
+
326
+ Clean-up an error codepath.
327
+
328
+ Will merge to 'master'.
329
+
330
+
331
+* jc/post-c89-rules-doc (2019-07-18) 1 commit
332
+ (merged to 'next' on 2019-07-19 at 8acd58e189)
333
+ + CodingGuidelines: spell out post-C89 rules
334
+
335
+ We have been trying out a few language features outside c89; the
336
+ coding guidelines document did not talk about them and instead had
337
+ a blanket ban against them.
338
+
339
+ Will merge to 'master'.
340
+
341
+
342
+* js/mingw-spawn-with-spaces-in-path (2019-07-16) 1 commit
343
+ (merged to 'next' on 2019-07-19 at 33dd6d0401)
344
+ + mingw: support spawning programs containing spaces in their names
345
+
346
+ Window 7 update ;-)
347
+
348
+ Will merge to 'master'.
349
+
350
+
351
+* sr/gpg-interface-stop-at-the-end (2019-07-16) 1 commit
352
+ (merged to 'next' on 2019-07-19 at 5d38aa1236)
353
+ + gpg-interface: do not scan past the end of buffer
354
+
355
+ A codepath that reads from GPG for signed object verification read
356
+ past the end of allocated buffer, which has been fixed.
357
+
358
+ Will merge to 'master'.
359
+
360
+
361
+* tg/stash-keep-index-with-removed-paths (2019-07-16) 1 commit
362
+ (merged to 'next' on 2019-07-19 at d4ae24a939)
363
+ + stash: fix handling removed files with --keep-index
364
+
365
+ "git stash --keep-index" did not work correctly on paths that have
366
+ been removed, which has been fixed.
367
+
368
+ Will merge to 'master'.
369
+
370
+
371
+* jc/denoise-rm-to-resolve (2019-07-18) 1 commit
372
+ (merged to 'next' on 2019-07-19 at 12f7e5d413)
373
+ + rm: resolving by removal is not a warning-worthy event
374
+
375
+ "git rm" to resolve a conflicted path leaked an internal message
376
+ "needs merge" before actually removing the path, which was
377
+ confusing. This has been corrected.
378
+
379
+ Will merge to 'master'.
380
+
381
+
382
+* js/clean-report-too-long-a-path (2019-07-19) 1 commit
383
+ (merged to 'next' on 2019-07-19 at b7da0a821c)
384
+ + clean: show an error message when the path is too long
385
+
386
+ "git clean" silently skipped a path when it cannot lstat() it; now
387
+ it gives a warning.
388
+
389
+ Will merge to 'master'.
390
+
391
+
392
+* di/readme-markup-fix (2019-07-18) 1 commit
393
+ (merged to 'next' on 2019-07-19 at 339470d824)
394
+ + README: fix rendering of text in angle brackets
395
250
- Documentation fix.
396
+ Docfix.
397
398
Will merge to 'master'.
399
400
255
-* ma/ref-filter-leakfix (2019-07-10) 1 commit
256
- (merged to 'next' on 2019-07-11 at a7a4bb81ac)
257
- + ref-filter: fix memory leak in `free_array_item()`
401
+* js/builtin-add-i (2019-07-18) 11 commits
402
+ - built-in add -i: implement the `help` command
403
+ - built-in add -i: use color in the main loop
404
+ - built-in add -i: support `?` (prompt help)
405
+ - built-in add -i: show unique prefixes of the commands
406
+ - Add a function to determine unique prefixes for a list of strings
407
+ - built-in add -i: implement the main loop
408
+ - built-in add -i: color the header in the `status` command
409
+ - built-in add -i: refresh the index before running `status`
410
+ - built-in add -i: implement the `status` command
411
+ - diff: export diffstat interface
412
+ - Start to implement a built-in version of `git add --interactive`
413
259
- Leakfix.
414
+ The beginning of rewriting "git add -i" in C.
415
261
- Will merge to 'master'.
416
+
417
+* js/visual-studio (2019-07-18) 24 commits
418
+ - git: avoid calling aliased builtins via their dashed form
419
+ - t5505,t5516: create .git/branches/ when needed
420
+ - bin-wrappers: append `.exe` to target paths if necessary
421
+ - .gitignore: ignore Visual Studio's temporary/generated files
422
+ - .gitignore: touch up the entries regarding Visual Studio
423
+ - vcxproj: also link-or-copy builtins
424
+ - msvc: add a Makefile target to pre-generate the Visual Studio solution
425
+ - contrib/buildsystems: add a backend for modern Visual Studio versions
426
+ - contrib/buildsystems: handle options starting with a slash
427
+ - contrib/buildsystems: also handle -lexpat
428
+ - contrib/buildsystems: handle libiconv, too
429
+ - contrib/buildsystems: handle the curl library option
430
+ - contrib/buildsystems: error out on unknown option
431
+ - contrib/buildsystems: optionally capture the dry-run in a file
432
+ - contrib/buildsystems: redirect errors of the dry run into a log file
433
+ - contrib/buildsystems: ignore gettext stuff
434
+ - contrib/buildsystems: handle quoted spaces in filenames
435
+ - contrib/buildsystems: fix misleading error message
436
+ - contrib/buildsystems: ignore irrelevant files in Generators/
437
+ - contrib/buildsystems: ignore invalidcontinue.obj
438
+ - Vcproj.pm: urlencode '<' and '>' when generating VC projects
439
+ - Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool
440
+ - Vcproj.pm: list git.exe first to be startup project
441
+ - Vcproj.pm: auto-generate GUIDs
442
+
443
+ Support building Git with Visual Studio
444
445
446
* js/unmap-before-ext-diff (2019-07-11) 1 commit
@@ -280,38 +462,21 @@ of the repositories listed at
462
463
464
* mt/dir-iterator-updates (2019-07-11) 10 commits
283
- - clone: replace strcmp by fspathcmp
284
- - clone: use dir-iterator to avoid explicit dir traversal
285
- - clone: extract function from copy_or_link_directory
286
- - clone: copy hidden paths at local clone
287
- - dir-iterator: add flags parameter to dir_iterator_begin
288
- - dir-iterator: refactor state machine model
289
- - dir-iterator: use warning_errno when possible
290
- - dir-iterator: add tests for dir-iterator API
291
- - clone: better handle symlinked files at .git/objects/
292
- - clone: test for our behavior on odd objects/* content
465
+ (merged to 'next' on 2019-07-19 at 2ebb586ce6)
466
+ + clone: replace strcmp by fspathcmp
467
+ + clone: use dir-iterator to avoid explicit dir traversal
468
+ + clone: extract function from copy_or_link_directory
469
+ + clone: copy hidden paths at local clone
470
+ + dir-iterator: add flags parameter to dir_iterator_begin
471
+ + dir-iterator: refactor state machine model
472
+ + dir-iterator: use warning_errno when possible
473
+ + dir-iterator: add tests for dir-iterator API
474
+ + clone: better handle symlinked files at .git/objects/
475
+ + clone: test for our behavior on odd objects/* content
476
477
Adjust the dir-iterator API and apply it to the local clone
478
optimization codepath.
479
297
- Will merge to 'next'.
298
-
299
-
300
-* ea/merge-code-cleanup (2019-07-09) 1 commit
301
- (merged to 'next' on 2019-07-11 at a7b831b03e)
302
- + builtin/merge.c - cleanup of code in for-cycle that tests strategies
303
-
304
- A loop has been rewritten for conciseness and clarity.
305
-
306
- Will merge to 'master'.
307
-
308
-
309
-* kb/mingw-set-home (2019-07-08) 1 commit
310
- (merged to 'next' on 2019-07-11 at 51c7e23dab)
311
- + mingw: initialize HOME on startup
312
-
313
- Windows port update.
314
-
480
Will merge to 'master'.
481
482
@@ -357,28 +522,9 @@ of the repositories listed at
522
within a few days.
523
524
360
-* pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit
361
- (merged to 'next' on 2019-07-09 at bf8f0af685)
362
- + git-prompt: improve cherry-pick/revert detection
363
-
364
- When one step in multi step cherry-pick or revert is reset or
365
- committed, the command line prompt script failed to notice the
366
- current status, which has been improved.
367
-
368
- Will merge to 'master'.
369
-
370
-
371
-* pw/rebase-progress-test-cleanup (2019-07-08) 1 commit
372
- (merged to 'next' on 2019-07-11 at 1363de0fe2)
373
- + t3420: remove progress lines before comparing output
374
-
375
- Test cleanup.
376
-
377
- Will merge to 'master'.
378
-
379
-
525
* es/local-atomic-push-failure-with-http (2019-07-16) 2 commits
381
- - transport-helper: avoid var decl in for () loop control
526
+ (merged to 'next' on 2019-07-19 at 8d5b776a96)
527
+ + transport-helper: avoid var decl in for () loop control
528
(merged to 'next' on 2019-07-15 at 960e92d24f)
529
+ transport-helper: enforce atomic in push_refs_with_push
530
@@ -387,7 +533,7 @@ of the repositories listed at
533
it can locally tell that one of the ref update will fail without
534
having to consult the other end, which has been corrected.
535
390
- Will merge to 'next'.
536
+ Will merge to 'master'.
537
538
539
* es/walken-tutorial (2019-07-02) 1 commit
@@ -396,36 +542,6 @@ of the repositories listed at
542
Yet another revision walker tutorial.
543
544
399
-* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
400
- (merged to 'next' on 2019-07-03 at f59ad42c4a)
401
- + ref-filter.c: find disjoint pattern prefixes
402
-
403
- "git for-each-ref" with multiple patterns have been optimized.
404
-
405
- Will merge to 'master'.
406
-
407
-
408
-* ew/repack-with-bitmaps-by-default (2019-07-01) 1 commit
409
- (merged to 'next' on 2019-07-09 at 985419cb6e)
410
- + repack: disable bitmaps-by-default if .keep files exist
411
-
412
- Generation of pack bitmaps are now disabled when .keep files exist,
413
- as these are mutually exclusive features.
414
-
415
- Will merge to 'master'.
416
-
417
-
418
-* jk/check-connected-with-alternates (2019-07-01) 2 commits
419
- (merged to 'next' on 2019-07-09 at b5888bd955)
420
- + check_everything_connected: assume alternate ref tips are valid
421
- + object-store.h: move for_each_alternate_ref() from transport.h
422
-
423
- The tips of refs from the alternate object store can be used as
424
- starting point for reachability computation now.
425
-
426
- Will merge to 'master'.
427
-
428
-
545
* jk/test-commit-bulk (2019-07-02) 7 commits
546
- SQUASH???
547
- t6200: use test_commit_bulk
@@ -477,19 +593,6 @@ of the repositories listed at
593
adoption" mindset may not match diverse use cases of the tool.
594
595
480
-* pw/status-with-corrupt-sequencer-state (2019-06-27) 3 commits
481
- (merged to 'next' on 2019-07-03 at 273aee6b3c)
482
- + status: do not report errors in sequencer/todo
483
- + sequencer: factor out todo command name parsing
484
- + sequencer: always allow tab after command name
485
-
486
- The code to read state files used by the sequencer machinery for
487
- "git status" has been made more robust against a corrupt or stale
488
- state files.
489
-
490
- Will merge to 'master'.
491
-
492
-
596
* ab/no-kwset (2019-07-01) 10 commits
597
(merged to 'next' on 2019-07-15 at ed0479ce3d)
598
+ grep: use PCRE v2 for optimized fixed-string search
@@ -509,22 +612,6 @@ of the repositories listed at
612
Will merge to 'master'.
613
614
512
-* nd/tree-walk-with-repo (2019-06-28) 7 commits
513
- (merged to 'next' on 2019-07-09 at 3e613f977c)
514
- + t7814: do not generate same commits in different repos
515
- + Use the right 'struct repository' instead of the_repository
516
- + match-trees.c: remove the_repo from shift_tree*()
517
- + tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
518
- + tree-walk.c: remove the_repo from get_tree_entry()
519
- + tree-walk.c: remove the_repo from fill_tree_descriptor()
520
- + sha1-file.c: remove the_repo from read_object_with_reference()
521
-
522
- The tree-walk API learned to pass an in-core repository
523
- instance throughout more codepaths.
524
-
525
- Will merge to 'master'.
526
-
527
-
615
* md/list-objects-filter-combo (2019-06-28) 10 commits
616
- list-objects-filter-options: make parser void
617
- list-objects-filter-options: clean up use of ALLOC_GROW
@@ -563,92 +650,6 @@ of the repositories listed at
650
Will be rerolled with the above.
651
652
566
-* ra/cherry-pick-revert-skip (2019-07-02) 5 commits
567
- (merged to 'next' on 2019-07-09 at 4ffa502220)
568
- + cherry-pick/revert: advise using --skip
569
- + cherry-pick/revert: add --skip option
570
- + sequencer: use argv_array in reset_merge
571
- + sequencer: rename reset_for_rollback to reset_merge
572
- + sequencer: add advice for revert
573
-
574
- "git cherry-pick/revert" learned a new "--skip" action.
575
-
576
- Will merge to 'master'.
577
-
578
-
579
-* cc/test-oidmap (2019-07-01) 6 commits
580
- (merged to 'next' on 2019-07-01 at 331a414a24)
581
- + t0016: add 'remove' subcommand test
582
- + test-oidmap: remove 'add' subcommand
583
- (merged to 'next' on 2019-06-27 at 247a4341ca)
584
- + test-hashmap: remove 'hash' command
585
- + oidmap: use sha1hash() instead of static hash() function
586
- + t: add t0016-oidmap.sh
587
- + t/helper: add test-oidmap.c
588
-
589
- Extend the test coverage a bit.
590
-
591
- Will merge to 'master'.
592
-
593
-
594
-* ds/midx-expire-repack (2019-07-01) 12 commits
595
- (merged to 'next' on 2019-07-01 at c2a907f395)
596
- + t5319: use 'test-tool path-utils' instead of 'ls -l'
597
- (merged to 'next' on 2019-06-27 at 35e6e3b38d)
598
- + t5319-multi-pack-index.sh: test batch size zero
599
- + midx: add test that 'expire' respects .keep files
600
- + multi-pack-index: test expire while adding packs
601
- + midx: implement midx_repack()
602
- + multi-pack-index: prepare 'repack' subcommand
603
- + multi-pack-index: implement 'expire' subcommand
604
- + midx: refactor permutation logic and pack sorting
605
- + midx: simplify computation of pack name lengths
606
- + multi-pack-index: prepare for 'expire' subcommand
607
- + Docs: rearrange subcommands for multi-pack-index
608
- + repack: refactor pack deletion for future use
609
-
610
- "git multi-pack-index" learned expire and repack subcommands.
611
-
612
- Will merge to 'master'.
613
-
614
-
615
-* jl/status-reduce-vertical-blank (2019-06-21) 1 commit
616
- (merged to 'next' on 2019-07-11 at 5716f37348)
617
- + status: remove the empty line after hints
618
-
619
- Extra blank lines in "git status" output have been reduced.
620
-
621
- Will merge to 'master'.
622
-
623
-
624
-* ds/commit-graph-incremental (2019-06-19) 18 commits
625
- (merged to 'next' on 2019-07-03 at 5dee5edbdf)
626
- + commit-graph: test verify across alternates
627
- + commit-graph: normalize commit-graph filenames
628
- + commit-graph: test --split across alternate without --split
629
- + commit-graph: test octopus merges with --split
630
- + commit-graph: clean up chains after flattened write
631
- + commit-graph: verify chains with --shallow mode
632
- + commit-graph: create options for split files
633
- + commit-graph: expire commit-graph files
634
- + commit-graph: allow cross-alternate chains
635
- + commit-graph: merge commit-graph chains
636
- + commit-graph: add --split option to builtin
637
- + commit-graph: write commit-graph chains
638
- + commit-graph: rearrange chunk count logic
639
- + commit-graph: add base graphs chunk
640
- + commit-graph: load commit-graph chains
641
- + commit-graph: rename commit_compare to oid_compare
642
- + commit-graph: prepare for commit-graph chains
643
- + commit-graph: document commit-graph chains
644
-
645
- The commits in a repository can be described by multiple
646
- commit-graph files now, which allows the commit-graph files to be
647
- updated incrementally.
648
-
649
- Will merge to 'master'.
650
-
651
-
653
* cc/multi-promisor (2019-06-25) 15 commits
654
- Move core_partial_clone_filter_default to promisor-remote.c
655
- Move repository_format_partial_clone to promisor-remote.c
@@ -703,24 +704,3 @@ of the repositories listed at
704
On hold.
705
cf. <20190508001252.15752-1-avarab@gmail.com>
706
cf. <xmqqa7fxionx.fsf@gitster-ct.c.googlers.com>
706
-
707
-
708
-* br/blame-ignore (2019-07-01) 11 commits
709
- (merged to 'next' on 2019-07-01 at f4b79421c9)
710
- + t8014: remove unnecessary braces
711
- + blame: drop some unused function parameters
712
- (merged to 'next' on 2019-06-27 at 36b91a787f)
713
- + blame: add a test to cover blame_coalesce()
714
- + blame: use the fingerprint heuristic to match ignored lines
715
- + blame: add a fingerprint heuristic to match ignored lines
716
- + blame: optionally track line fingerprints during fill_blame_origin()
717
- + blame: add config options for the output of ignored or unblamable lines
718
- + blame: add the ability to ignore commits and their changes
719
- + blame: use a helper function in blame_chunk()
720
- + Move oidset_parse_file() to oidset.c
721
- + fsck: rename and touch up init_skiplist()
722
-
723
- "git blame" learned to "ignore" commits in the history, whose
724
- effects (as well as their presence) get ignored.
725
-
726
- Will merge to 'master'.