What's cooking (2019/07 #06)
Junio C Hamano committed
Jul 25, 2019 at 15:32 UTC
ed289a7a4775220f436656b15347b3efb4072cd8
1 file changed
+255
-385
whats-cooking.txt
+255
-385
@@ -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, #05; Fri, 19)
4
-X-master-at: 9c9b961d7eb15fb583a2a812088713a68a85f1c0
5
-X-next-at: 102302147b47505b8667bbd7a42e242728b3a860
3
+Subject: What's cooking in git.git (Jul 2019, #06; Thu, 25)
4
+X-master-at: 3034dab9ed6b11970a53099a7b3ca981f1461365
5
+X-next-at: 0f2c4a37fdba75d06ae7254c4b30ed7739985214
6
7
-What's cooking in git.git (Jul 2019, #05; Fri, 19)
7
+What's cooking in git.git (Jul 2019, #06; Thu, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,9 @@ 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.
15
+The seventh batch is in; I've merged fix-up topics that has been in
16
+'master' for some time (i.e. up to the third batch of this cycle)
17
+down to 'maint'.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -23,196 +24,292 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
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
-
41
- "git blame" learned to "ignore" commits in the history, whose
42
- effects (as well as their presence) get ignored.
43
-
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
27
+* ab/test-env (2019-07-11) 9 commits
28
+ (merged to 'next' on 2019-07-15 at 42e86beb20)
29
+ + env--helper: mark a file-local symbol as static
30
+ (merged to 'next' on 2019-07-09 at 096658f382)
31
+ + tests: make GIT_TEST_FAIL_PREREQS a boolean
32
+ + tests: replace test_tristate with "git env--helper"
33
+ + tests README: re-flow a previously changed paragraph
34
+ + tests: make GIT_TEST_GETTEXT_POISON a boolean
35
+ + t6040 test: stop using global "script" variable
36
+ + config.c: refactor die_bad_number() to not call gettext() early
37
+ + env--helper: new undocumented builtin wrapping git_env_*()
38
+ + config tests: simplify include cycle test
39
+
40
+ Many GIT_TEST_* environment variables control various aspects of
41
+ how our tests are run, but a few followed "non-empty is true, empty
42
+ or unset is false" while others followed the usual "there are a few
43
+ ways to spell true, like yes, on, etc., and also ways to spell
44
+ false, like no, off, etc." convention.
45
+
46
+
47
+* ac/log-use-mailmap-by-default-transition (2019-07-15) 3 commits
48
+ (merged to 'next' on 2019-07-19 at e5669de950)
49
+ + tests: defang pager tests by explicitly disabling the log.mailmap warning
50
+ + documentation: mention --no-use-mailmap and log.mailmap false setting
51
+ + log: add warning for unspecified log.mailmap setting
52
+
53
+ The "git log" command learns to issue a warning when log.mailmap
54
+ configuration is not set and --[no-]mailmap option is not used, to
55
+ prepare users for future versions of Git that uses the mailmap by
56
+ default.
57
+
58
+
59
+* di/readme-markup-fix (2019-07-18) 1 commit
60
+ (merged to 'next' on 2019-07-19 at 339470d824)
61
+ + README: fix rendering of text in angle brackets
62
+
63
+ Docfix.
64
+
65
+
66
+* es/local-atomic-push-failure-with-http (2019-07-16) 2 commits
67
+ (merged to 'next' on 2019-07-19 at 8d5b776a96)
68
+ + transport-helper: avoid var decl in for () loop control
69
+ (merged to 'next' on 2019-07-15 at 960e92d24f)
70
+ + transport-helper: enforce atomic in push_refs_with_push
71
+
72
+ "git push --atomic" that goes over the transport-helper (namely,
73
+ the smart http transport) failed to prevent refs to be pushed when
74
+ it can locally tell that one of the ref update will fail without
75
+ having to consult the other end, which has been corrected.
76
+
77
+
78
+* jc/denoise-rm-to-resolve (2019-07-18) 1 commit
79
+ (merged to 'next' on 2019-07-19 at 12f7e5d413)
80
+ + rm: resolving by removal is not a warning-worthy event
81
+
82
+ "git rm" to resolve a conflicted path leaked an internal message
83
+ "needs merge" before actually removing the path, which was
84
+ confusing. This has been corrected.
85
+
86
+
87
+* jc/post-c89-rules-doc (2019-07-18) 1 commit
88
+ (merged to 'next' on 2019-07-19 at 8acd58e189)
89
+ + CodingGuidelines: spell out post-C89 rules
90
+
91
+ We have been trying out a few language features outside c89; the
92
+ coding guidelines document did not talk about them and instead had
93
+ a blanket ban against them.
94
+
95
+
96
+* jk/test-commit-bulk (2019-07-23) 6 commits
97
+ (merged to 'next' on 2019-07-23 at edc849c7dd)
98
+ + t6200: use test_commit_bulk
99
+ + t5703: use test_commit_bulk
100
+ + t5702: use test_commit_bulk
101
+ + t3311: use test_commit_bulk
102
+ + t5310: increase the number of bitmapped commits
103
+ + test-lib: introduce test_commit_bulk
104
+
105
+ A test helper has been introduced to optimize preparation of test
106
+ repositories with many simple commits, and a handful of test
107
+ scripts have been updated to use it.
108
+
109
+
110
+* js/clean-report-too-long-a-path (2019-07-19) 1 commit
111
+ (merged to 'next' on 2019-07-19 at b7da0a821c)
112
+ + clean: show an error message when the path is too long
113
+
114
+ "git clean" silently skipped a path when it cannot lstat() it; now
115
+ it gives a warning.
116
+
117
+
118
+* js/mingw-spawn-with-spaces-in-path (2019-07-16) 1 commit
119
+ (merged to 'next' on 2019-07-19 at 33dd6d0401)
120
+ + mingw: support spawning programs containing spaces in their names
121
+
122
+ Window 7 update ;-)
123
+
124
+
125
+* js/unmap-before-ext-diff (2019-07-11) 1 commit
126
+ (merged to 'next' on 2019-07-15 at 7aa292c66c)
127
+ + diff: munmap() file contents before running external diff
128
+
129
+ Windows update.
130
+
131
+
132
+* mt/dir-iterator-updates (2019-07-11) 10 commits
133
+ (merged to 'next' on 2019-07-19 at 2ebb586ce6)
134
+ + clone: replace strcmp by fspathcmp
135
+ + clone: use dir-iterator to avoid explicit dir traversal
136
+ + clone: extract function from copy_or_link_directory
137
+ + clone: copy hidden paths at local clone
138
+ + dir-iterator: add flags parameter to dir_iterator_begin
139
+ + dir-iterator: refactor state machine model
140
+ + dir-iterator: use warning_errno when possible
141
+ + dir-iterator: add tests for dir-iterator API
142
+ + clone: better handle symlinked files at .git/objects/
143
+ + clone: test for our behavior on odd objects/* content
144
55
- Extend the test coverage a bit.
145
+ Adjust the dir-iterator API and apply it to the local clone
146
+ optimization codepath.
147
148
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
149
+* rm/gpg-program-doc-fix (2019-07-12) 1 commit
150
+ (merged to 'next' on 2019-07-15 at ef358ec2e9)
151
+ + gpg(docs): use correct --verify syntax
152
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.
153
+ Docfix.
154
155
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
156
+* sr/gpg-interface-stop-at-the-end (2019-07-16) 1 commit
157
+ (merged to 'next' on 2019-07-19 at 5d38aa1236)
158
+ + gpg-interface: do not scan past the end of buffer
159
100
- "git multi-pack-index" learned expire and repack subcommands.
160
+ A codepath that reads from GPG for signed object verification read
161
+ past the end of allocated buffer, which has been fixed.
162
163
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
164
+* tg/range-diff-output-update (2019-07-11) 14 commits
165
+ (merged to 'next' on 2019-07-15 at b847d206ed)
166
+ + range-diff: add headers to the outer hunk header
167
+ + range-diff: add filename to inner diff
168
+ + range-diff: add section header instead of diff header
169
+ + range-diff: suppress line count in outer diff
170
+ + range-diff: don't remove funcname from inner diff
171
+ + range-diff: split lines manually
172
+ + range-diff: fix function parameter indentation
173
+ + apply: make parse_git_diff_header public
174
+ + apply: only pass required data to gitdiff_* functions
175
+ + apply: only pass required data to find_name_*
176
+ + apply: only pass required data to check_header_line
177
+ + apply: only pass required data to git_header_name
178
+ + apply: only pass required data to skip_tree_prefix
179
+ + apply: replace marc.info link with public-inbox
180
107
- A loop has been rewritten for conciseness and clarity.
181
+ "git range-diff" output has been tweaked for easier identification
182
+ of which part of what file the patch shown is about.
183
184
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
185
+* tg/stash-keep-index-with-removed-paths (2019-07-16) 1 commit
186
+ (merged to 'next' on 2019-07-19 at d4ae24a939)
187
+ + stash: fix handling removed files with --keep-index
188
114
- Generation of pack bitmaps are now disabled when .keep files exist,
115
- as these are mutually exclusive features.
189
+ "git stash --keep-index" did not work correctly on paths that have
190
+ been removed, which has been fixed.
191
192
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
193
+* vn/xmmap-gently (2019-07-14) 1 commit
194
+ (merged to 'next' on 2019-07-19 at d95c1d2be3)
195
+ + read-cache.c: do not die if mmap fails
196
123
- The tips of refs from the alternate object store can be used as
124
- starting point for reachability computation now.
197
+ Clean-up an error codepath.
198
+
199
+--------------------------------------------------
200
+[New Topics]
201
202
+* bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit
203
+ (merged to 'next' on 2019-07-23 at 8bd5a68618)
204
+ + grep: print the pcre2_jit_on value
205
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
206
+ BUG() message fix.
207
131
- Extra blank lines in "git status" output have been reduced.
208
+ The codepath may want to just simply be removed, though.
209
210
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
211
+* ra/rebase-i-more-options (2019-07-23) 4 commits
212
+ - SQUASH???
213
+ - rebase -i: support --committer-date-is-author-date
214
+ - sequencer: add NULL checks under read_author_script
215
+ - rebase -i: add --ignore-whitespace flag
216
138
- Documentation fix.
217
+ "git rebase -i" learned a few options that are known by "git
218
+ rebase" proper.
219
220
+ Needs a bit of fixups, at least.
221
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
222
145
- Windows port update.
223
+* sg/travis-gcc-4.8 (2019-07-19) 1 commit
224
+ (merged to 'next' on 2019-07-25 at e3d546eb15)
225
+ + travis-ci: build with GCC 4.8 as well
226
227
+ Add a job to build with a tad older GCC to make sure we are still
228
+ buildable.
229
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()`
230
+ Will merge to 'master'.
231
152
- Leakfix.
232
233
+* ab/pcre-jit-fixes (2019-07-24) 3 commits
234
+ - grep: stop using a custom JIT stack with PCRE v1
235
+ - grep: stop "using" a custom JIT stack with PCRE v2
236
+ - grep: remove overly paranoid BUG(...) code
237
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()
238
+ A few simplification and bugfixes to PCRE interface.
239
165
- The tree-walk API learned to pass an in-core repository
166
- instance throughout more codepaths.
240
+ Will merge to 'next'.
241
242
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
243
+* jk/xdiff-clamp-funcname-context-index (2019-07-23) 1 commit
244
+ (merged to 'next' on 2019-07-25 at b2944a0ba6)
245
+ + xdiff: clamp function context indices in post-image
246
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.
247
+ The internal diff machinery can be made to read out of bounds while
248
+ looking for --funcion-context line in a corner case, which has been
249
+ corrected.
250
251
+ Will merge to 'master'.
252
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
253
182
- Test cleanup.
254
+* js/rebase-cleanup (2019-07-25) 2 commits
255
+ (merged to 'next' on 2019-07-25 at 3d9cedf470)
256
+ + git: mark cmd_rebase as requiring a worktree
257
+ + rebase: fix white-space
258
259
+ A few leftover cleanup to "git rebase" in C.
260
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
261
+ Will merge to 'master'.
262
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.
263
264
+* js/rebase-r-strategy (2019-07-25) 12 commits
265
+ - rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
266
+ - t3418: test `rebase -r` with merge strategies
267
+ - t/lib-rebase: prepare for testing `git rebase --rebase-merges`
268
+ - rebase -r: support merge strategies other than `recursive`
269
+ - t3427: mark two test cases as requiring support for `git rebase -p`
270
+ - t3427: fix another incorrect assumption
271
+ - t3427: accommodate for the `rebase --merge` backend having been replaced
272
+ - t3427: fix erroneous assumption
273
+ - t3427: condense the unnecessarily repetitive test cases into three
274
+ - t3427: move the `filter-branch` invocation into the `setup` case
275
+ - t3427: simplify the `setup` test case significantly
276
+ - t3427: add a clarifying comment
277
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
278
+ "git rebase --rebase-merges" learned to drive different merge
279
+ strategies and pass strategy specific options to them.
280
204
- "git cherry-pick/revert" learned a new "--skip" action.
281
282
+* js/trace2-json-schema (2019-07-25) 3 commits
283
+ - ci: run trace2 schema validation in the CI suite
284
+ - trace2: add a schema validator for trace2 events
285
+ - trace2: add a JSON schema for trace2 events
286
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
287
+ The JSON output produced by "trace2" subsystem now has JSON schema
288
+ defined on it, to allow us validate the output and catch deviation.
289
211
- "git for-each-ref" with multiple patterns have been optimized.
290
+ The CI integration may be a bit too heavy-handed.
291
292
--------------------------------------------------
293
[Stalled]
294
295
+* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
296
+ - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
297
+
298
+ Compilation fix.
299
+
300
+ Will be rerolled together with patches from the
301
+ jk/no-system-includes-in-dot-c topic.
302
+
303
+
304
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
305
+ - wt-status.h: drop stdio.h include
306
+ - verify-tag: drop signal.h include
307
+
308
+ Compilation fix.
309
+
310
+ Will be rerolled with the above.
311
+
312
+
313
* nd/index-dump-in-json (2019-06-26) 11 commits
314
- SQUASH???
315
- t3008: use the new SINGLE_CPU prereq
@@ -269,8 +366,6 @@ of the repositories listed at
366
WIP for allowing a response to "git fetch" to instruct the bulk of
367
the pack contents to be instead taken from elsewhere (aka CDN).
368
272
- Stalled
273
-
369
370
* js/protocol-advertise-multi (2018-12-28) 1 commit
371
- protocol: advertise multiple supported versions
@@ -305,99 +400,6 @@ of the repositories listed at
400
--------------------------------------------------
401
[Cooking]
402
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
-
396
- Docfix.
397
-
398
- Will merge to 'master'.
399
-
400
-
403
* js/builtin-add-i (2019-07-18) 11 commits
404
- built-in add -i: implement the `help` command
405
- built-in add -i: use color in the main loop
@@ -442,65 +444,8 @@ of the repositories listed at
444
445
Support building Git with Visual Studio
446
445
-
446
-* js/unmap-before-ext-diff (2019-07-11) 1 commit
447
- (merged to 'next' on 2019-07-15 at 7aa292c66c)
448
- + diff: munmap() file contents before running external diff
449
-
450
- Windows update.
451
-
452
- Will merge to 'master'.
453
-
454
-
455
-* rm/gpg-program-doc-fix (2019-07-12) 1 commit
456
- (merged to 'next' on 2019-07-15 at ef358ec2e9)
457
- + gpg(docs): use correct --verify syntax
458
-
459
- Docfix.
460
-
461
- Will merge to 'master'.
462
-
463
-
464
-* mt/dir-iterator-updates (2019-07-11) 10 commits
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
-
480
- Will merge to 'master'.
481
-
482
-
483
-* tg/range-diff-output-update (2019-07-11) 14 commits
484
- (merged to 'next' on 2019-07-15 at b847d206ed)
485
- + range-diff: add headers to the outer hunk header
486
- + range-diff: add filename to inner diff
487
- + range-diff: add section header instead of diff header
488
- + range-diff: suppress line count in outer diff
489
- + range-diff: don't remove funcname from inner diff
490
- + range-diff: split lines manually
491
- + range-diff: fix function parameter indentation
492
- + apply: make parse_git_diff_header public
493
- + apply: only pass required data to gitdiff_* functions
494
- + apply: only pass required data to find_name_*
495
- + apply: only pass required data to check_header_line
496
- + apply: only pass required data to git_header_name
497
- + apply: only pass required data to skip_tree_prefix
498
- + apply: replace marc.info link with public-inbox
499
-
500
- "git range-diff" output has been tweaked for easier identification
501
- of which part of what file the patch shown is about.
502
-
503
- Will merge to 'master'.
447
+ The ".git/branches" bit needs to be ejected and treated separately,
448
+ but other than that, the topic looked reasonable.
449
450
451
* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
@@ -517,23 +462,7 @@ of the repositories listed at
462
463
Update to the tests to help SHA-256 transition continues.
464
520
- Ready? After cursory scan of this series I didn't find anything
521
- glaringly wrong. Will merge to 'next' until I hear otherwise
522
- within a few days.
523
-
524
-
525
-* es/local-atomic-push-failure-with-http (2019-07-16) 2 commits
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
-
531
- "git push --atomic" that goes over the transport-helper (namely,
532
- the smart http transport) failed to prevent refs to be pushed when
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
-
536
- Will merge to 'master'.
465
+ Will merge to 'next'.
466
467
468
* es/walken-tutorial (2019-07-02) 1 commit
@@ -542,45 +471,6 @@ of the repositories listed at
471
Yet another revision walker tutorial.
472
473
545
-* jk/test-commit-bulk (2019-07-02) 7 commits
546
- - SQUASH???
547
- - t6200: use test_commit_bulk
548
- - t5703: use test_commit_bulk
549
- - t5702: use test_commit_bulk
550
- - t3311: use test_commit_bulk
551
- - t5310: increase the number of bitmapped commits
552
- - test-lib: introduce test_commit_bulk
553
-
554
- A test helper has been introduced to optimize preparation of test
555
- repositories with many simple commits, and a handful of test
556
- scripts have been updated to use it.
557
-
558
- Needs a bit more polishing.
559
- I think I spotted one unused command, which we may want to remove, though.
560
-
561
-
562
-* ab/test-env (2019-07-11) 9 commits
563
- (merged to 'next' on 2019-07-15 at 42e86beb20)
564
- + env--helper: mark a file-local symbol as static
565
- (merged to 'next' on 2019-07-09 at 096658f382)
566
- + tests: make GIT_TEST_FAIL_PREREQS a boolean
567
- + tests: replace test_tristate with "git env--helper"
568
- + tests README: re-flow a previously changed paragraph
569
- + tests: make GIT_TEST_GETTEXT_POISON a boolean
570
- + t6040 test: stop using global "script" variable
571
- + config.c: refactor die_bad_number() to not call gettext() early
572
- + env--helper: new undocumented builtin wrapping git_env_*()
573
- + config tests: simplify include cycle test
574
-
575
- Many GIT_TEST_* environment variables control various aspects of
576
- how our tests are run, but a few followed "non-empty is true, empty
577
- or unset is false" while others followed the usual "there are a few
578
- ways to spell true, like yes, on, etc., and also ways to spell
579
- false, like no, off, etc." convention.
580
-
581
- Will merge to 'master'.
582
-
583
-
474
* ds/early-access (2019-07-01) 3 commits
475
- repo-settings: pack.useSparse=true
476
- repo-settings: use index.version=4 by default
@@ -589,8 +479,9 @@ of the repositories listed at
479
A mechanism to enable newish configuration settings in bulk has
480
been invented.
481
592
- The model may need to be rethought. A linear scale with "early
593
- adoption" mindset may not match diverse use cases of the tool.
482
+ Will replace with a redesigned variant which is being discussed
483
+ when the dust settles.
484
+ cf. <pull.292.v2.git.gitgitgadget@gmail.com> (v2)
485
486
487
* ab/no-kwset (2019-07-01) 10 commits
@@ -609,7 +500,8 @@ of the repositories listed at
500
Retire use of kwset library, which is an optimization for looking
501
for fixed strings, with use of pcre2 JIT.
502
612
- Will merge to 'master'.
503
+ Needs to wait for a few pcre JIT related fixups, including the
504
+ handling of non-UTF8 haystack.
505
506
507
* md/list-objects-filter-combo (2019-06-28) 10 commits
@@ -627,27 +519,7 @@ of the repositories listed at
519
The list-objects-filter API (used to create a sparse/lazy clone)
520
learned to take a combined filter specification.
521
630
- There is a bit of interaction with cc/multi-promisor topic, whose
631
- conflict resolution I have no confidence in X-<. Extra sets of
632
- eyes are appreciated.
633
-
634
-
635
-* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
636
- - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
637
-
638
- Compilation fix.
639
-
640
- Will be rerolled together with patches from the
641
- jk/no-system-includes-in-dot-c topic.
642
-
643
-
644
-* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
645
- - wt-status.h: drop stdio.h include
646
- - verify-tag: drop signal.h include
647
-
648
- Compilation fix.
649
-
650
- Will be rerolled with the above.
522
+ Will merge to 'next'.
523
524
525
* cc/multi-promisor (2019-06-25) 15 commits
@@ -671,9 +543,7 @@ of the repositories listed at
543
promisor remote and consult them in order when downloading missing
544
objects on demand.
545
674
- There is a bit of interaction with md/list-objects-filter-combo
675
- topic, whose conflict resolution I have no confidence in X-<.
676
- Extra sets of eyes are appreciated.
546
+ Will merge to 'next'.
547
548
549
* jc/format-patch-noclobber (2019-02-22) 1 commit
@@ -682,7 +552,7 @@ of the repositories listed at
552
"git format-patch" used to overwrite an existing patch/cover-letter
553
file. A new "--no-clobber" option stops it.
554
685
- Undecided but inclined to discard.
555
+ Will discard.
556
557
558
* dl/rebase-i-keep-base (2019-04-25) 6 commits
@@ -703,4 +573,4 @@ of the repositories listed at
573
574
On hold.
575
cf. <20190508001252.15752-1-avarab@gmail.com>
706
- cf. <xmqqa7fxionx.fsf@gitster-ct.c.googlers.com>
576
+ cf. <20190719210156.GA9688@archbookpro.localdomain>