What's cooking (2019/02 #03)
Junio C Hamano committed
Feb 13, 2019 at 19:05 UTC
613b3c7af4b79bf3f0d7962ab04daba9eba78984
1 file changed
+163
-360
whats-cooking.txt
+163
-360
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2019, #02; Wed, 6)
4
-X-master-at: d62dad7a7dca3f6a65162bf0e52cdf6927958e78
5
-X-next-at: b571404aecccbd67727636813e633bcd481c0f3d
3
+Subject: What's cooking in git.git (Feb 2019, #03; Wed, 13)
4
+X-master-at: 8989e1950a845ceeb186d490321a4f917ca4de47
5
+X-next-at: 12f185b1dd353fa64489f4c47ca0d58b4aa858f8
6
7
-What's cooking in git.git (Feb 2019, #02; Wed, 6)
7
+What's cooking in git.git (Feb 2019, #03; Wed, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,13 +12,8 @@ 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
-An early preview of upcoming release 2.21-rc0 has been tagged with
16
-the sixth batch of topic. Usually I try to keep topics in 'next'
17
-for at least a week before merging them to 'master', in order to
18
-keep 'master' from getting too unstable, but for this batch, many
19
-topics spent only a day in 'next'. Hopefully the last minute bugs
20
-will have the same, if not better, likelihood to get discovered and
21
-fixed, whether the topics are in 'next' or '-rc0'. We'll see.
15
+The first release candidate for the upcoming Git 2.21 has been
16
+tagged and pushed out.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -28,330 +23,182 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
31
-* ab/diff-tree-doc-fix (2019-02-04) 1 commit
32
- (merged to 'next' on 2019-02-05 at 123f48fa2e)
33
- + diff-tree doc: correct & remove wrong documentation
26
+* bc/utf16-portability-fix (2019-02-11) 1 commit
27
+ (merged to 'next' on 2019-02-11 at a33208b3)
28
+ + utf8: handle systems that don't write BOM for UTF-16
29
35
- Doc fix.
30
+ The code and tests assume that the system supplied iconv() would
31
+ always use BOM in its output when asked to encode to UTF-16 (or
32
+ UTF-32), but apparently some implementations output big-endian
33
+ without BOM. A compile-time knob has been added to help such
34
+ systems (e.g. NonStop) to add BOM to the output to increase
35
+ portability.
36
37
38
-* bc/fetch-pack-clear-alternate-shallow (2019-02-06) 2 commits
39
- (merged to 'next' on 2019-02-06 at 2ebc2c9f87)
40
- + fetch-pack: clear alternate shallow in one more place
41
- (merged to 'next' on 2019-02-05 at 14392fb6b2)
42
- + fetch-pack: clear alternate shallow when complete
43
-
44
- "git fetch" over protocol v2 that needs to make a second connection
45
- to backfill tags did not clear a variable that holds shallow
46
- repository information correctly, leading to an access of freed
47
- piece of memory.
48
-
49
-
50
-* br/commit-tree-fully-spelled-gpg-sign-option (2019-01-22) 2 commits
51
- (merged to 'next' on 2019-02-05 at a0a1e30471)
52
- + commit-tree: add missing --gpg-sign flag
53
- + t7510: invoke git as part of &&-chain
54
-
55
- The documentation of "git commit-tree" said that the command
56
- understands "--gpg-sign" in addition to "-S", but the command line
57
- parser did not know about the longhand, which has been corrected.
38
+* ds/coverage-prove (2019-01-29) 1 commit
39
+ (merged to 'next' on 2019-02-06 at 0fc57228ec)
40
+ + Makefile: add coverage-prove target
41
42
+ A new target "coverage-prove" to run the coverage test under
43
+ "prove" has been added.
44
60
-* ds/push-sparse-tree-walk (2019-01-17) 5 commits
61
- (merged to 'next' on 2019-02-05 at 9fd04c84d6)
62
- + pack-objects: create GIT_TEST_PACK_SPARSE
63
- + pack-objects: create pack.useSparse setting
64
- + revision: implement sparse algorithm
65
- + list-objects: consume sparse tree walk
66
- + revision: add mark_tree_uninteresting_sparse
45
68
- "git pack-objects" learned another algorithm to compute the set of
69
- objects to send, that trades the resulting packfile off to save
70
- traversal cost to favor small pushes.
46
+* js/fuzz-commit-graph-update (2019-02-07) 2 commits
47
+ (merged to 'next' on 2019-02-07 at 689019b0ca)
48
+ + object: fix leak of shallow_stat
49
+ + fuzz-commit-graph: initialize repo object
50
51
+ Update to the fuzzer.
52
73
-* dt/cat-file-batch-ambiguous (2019-01-31) 2 commits
74
- (merged to 'next' on 2019-02-05 at 121d162945)
75
- + t1512: test ambiguous cat-file --batch and --batch-output
76
- + Do not print 'dangling' for cat-file in case of ambiguity
53
78
- "git cat-file --batch" reported a dangling symbolic link by
79
- mistake, when it wanted to report that a given name is ambiguous.
54
+* js/mingw-host-cpu (2019-02-07) 1 commit
55
+ (merged to 'next' on 2019-02-07 at cbd8634816)
56
+ + mingw: fix CPU reporting in `git version --build-options`
57
58
+ Windows update.
59
82
-* en/rebase-merge-on-sequencer (2019-01-07) 8 commits
83
- (merged to 'next' on 2019-02-05 at 88823d7c86)
84
- + rebase: implement --merge via the interactive machinery
85
- + rebase: define linearization ordering and enforce it
86
- + git-legacy-rebase: simplify unnecessary triply-nested if
87
- + git-rebase, sequencer: extend --quiet option for the interactive machinery
88
- + am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
89
- + t5407: add a test demonstrating how interactive handles --skip differently
90
- + rebase: fix incompatible options error message
91
- + rebase: make builtin and legacy script error messages the same
60
93
- "git rebase --merge" as been reimplemented by reusing the internal
94
- machinery used for "git rebase -i".
61
+* js/rebase-i-redo-exec-fix (2019-02-06) 1 commit
62
+ (merged to 'next' on 2019-02-06 at 9f99bee768)
63
+ + Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
64
65
+ For "rebase -i --reschedule-failed-exec", we do not want the "-y"
66
+ shortcut after all.
67
97
-* jk/add-ignore-errors-bit-assignment-fix (2019-02-06) 1 commit
98
- (merged to 'next' on 2019-02-06 at 46cf370d8b)
99
- + add_to_index(): convert forgotten HASH_RENORMALIZE check
68
101
- A hotfix to an incomplete fix made earlier.
69
+* js/smart-http-detect-remote-error (2019-02-06) 3 commits
70
+ (merged to 'next' on 2019-02-06 at ec1a6f67c1)
71
+ + t5551: test server-side ERR packet
72
+ + remote-curl: tighten "version 2" check for smart-http
73
+ + remote-curl: refactor smart-http discovery
74
75
+ Some errors from the other side coming over smart HTTP transport
76
+ were not noticed, which has been corrected.
77
104
-* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits
105
- (merged to 'next' on 2019-02-05 at 2b372ed6e9)
106
- + docs/config: clarify "text property" in core.eol
107
- + doc/gitattributes: clarify "autocrlf overrides eol"
78
109
- Documentation around core.crlf has been updated.
79
+* kd/t0028-octal-del-is-377-not-777 (2019-02-11) 1 commit
80
+ (merged to 'next' on 2019-02-11 at 1e1ee7e15d)
81
+ + t0028: fix wrong octal values for BOM in setup
82
83
+ Test fix.
84
112
-* jk/loose-object-cache-oid (2019-01-08) 11 commits
113
- (merged to 'next' on 2019-02-05 at 5cbc954aa5)
114
- + prefer "hash mismatch" to "sha1 mismatch"
115
- + sha1-file: avoid "sha1 file" for generic use in messages
116
- + sha1-file: prefer "loose object file" to "sha1 file" in messages
117
- + sha1-file: drop has_sha1_file()
118
- + convert has_sha1_file() callers to has_object_file()
119
- + sha1-file: convert pass-through functions to object_id
120
- + sha1-file: modernize loose header/stream functions
121
- + sha1-file: modernize loose object file functions
122
- + http: use struct object_id instead of bare sha1
123
- + update comment references to sha1_object_info()
124
- + sha1-file: fix outdated sha1 comment references
85
126
- Code clean-up.
86
+* kl/pretty-doc-markup-fix (2019-02-07) 1 commit
87
+ (merged to 'next' on 2019-02-07 at c01e44520b)
88
+ + doc: prevent overflowing <code> tag in rendered HTML
89
90
+ Doc update.
91
129
-* jk/unused-parameter-cleanup (2019-01-24) 8 commits
130
- (merged to 'next' on 2019-02-05 at 213400362c)
131
- + convert: drop path parameter from actual conversion functions
132
- + convert: drop len parameter from conversion checks
133
- + config: drop unused parameter from maybe_remove_section()
134
- + show_date_relative(): drop unused "tz" parameter
135
- + column: drop unused "opts" parameter in item_length()
136
- + create_bundle(): drop unused "header" parameter
137
- + apply: drop unused "def" parameter from find_name_gnu()
138
- + match-trees: drop unused path parameter from score functions
139
-
140
- Code cleanup.
141
-
142
-
143
-* js/rebase-am (2019-01-18) 4 commits
144
- (merged to 'next' on 2019-02-05 at cb92db8ecf)
145
- + built-in rebase: call `git am` directly
146
- + rebase: teach `reset_head()` to optionally skip the worktree
147
- + rebase: avoid double reflog entry when switching branches
148
- + rebase: move `reset_head()` into a better spot
149
-
150
- Instead of going through "git-rebase--am" scriptlet to use the "am"
151
- backend, the built-in version of "git rebase" learned to drive the
152
- "am" backend directly.
153
-
154
-
155
-* js/vsts-ci (2019-02-06) 22 commits
156
- (merged to 'next' on 2019-02-06 at fe1a5e9d5c)
157
- + test-date: drop unused parameter to getnanos()
158
- (merged to 'next' on 2019-02-05 at 7297a734c7)
159
- + ci: parallelize testing on Windows
160
- + ci: speed up Windows phase
161
- + tests: optionally skip bin-wrappers/
162
- + t0061: workaround issues with --with-dashes and RUNTIME_PREFIX
163
- + tests: add t/helper/ to the PATH with --with-dashes
164
- + mingw: try to work around issues with the test cleanup
165
- + tests: include detailed trace logs with --write-junit-xml upon failure
166
- + tests: avoid calling Perl just to determine file sizes
167
- + README: add a build badge (status of the Azure Pipelines build)
168
- + mingw: be more generous when wrapping up the setitimer() emulation
169
- + ci: use git-sdk-64-minimal build artifact
170
- + ci: add a Windows job to the Azure Pipelines definition
171
- + Add a build definition for Azure DevOps
172
- + ci/lib.sh: add support for Azure Pipelines
173
- + tests: optionally write results as JUnit-style .xml
174
- + test-date: add a subcommand to measure times in shell scripts
175
- + ci: use a junction on Windows instead of a symlink
176
- + ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
177
- + ci/lib.sh: encapsulate Travis-specific things
178
- + ci: rename the library of common functions
179
- + travis: fix skipping tagged releases
180
-
181
- Prepare to run test suite on Azure Pipeline.
182
-
183
-
184
-* km/init-doc-typofix (2019-01-31) 1 commit
185
- (merged to 'next' on 2019-02-05 at ee90a62a1c)
186
- + init docs: correct a punctuation typo
187
-
188
- Docfix.
189
-
190
-
191
-* lt/date-human (2019-01-29) 5 commits
192
- (merged to 'next' on 2019-02-05 at f2850c9fc0)
193
- + Add `human` date format tests.
194
- + Add `human` format to test-tool
195
- + Add 'human' date format documentation
196
- + Replace the proposed 'auto' mode with 'auto:'
197
- + Add 'human' date format
198
-
199
- A new date format "--date=human" that morphs its output depending
200
- on how far the time is from the current time has been introduced.
201
- "--date=auto" can be used to use this new format when the output is
202
- going to the pager or to the terminal and otherwise the default
203
- format.
204
-
205
-
206
-* ma/doc-diff-usage-fix (2019-02-04) 1 commit
207
- (merged to 'next' on 2019-02-05 at 18f3f4bc59)
208
- + doc-diff: don't `cd_to_toplevel`
209
-
210
- Running "Documentation/doc-diff x" from anywhere other than the
211
- top-level of the working tree did not show the usage string
212
- correctly, which has been fixed.
213
-
214
-
215
-* nd/commit-doc (2019-02-04) 1 commit
216
- (merged to 'next' on 2019-02-05 at 07b341767e)
217
- + git-commit.txt: better description what it does
92
219
- Doc update.
93
+* ld/git-p4-remove-flakey-test (2019-02-06) 1 commit
94
+ (merged to 'next' on 2019-02-06 at 0100bce8b6)
95
+ + git-p4: remove ticket expiry test
96
97
+ A flakey "p4" test has been removed.
98
222
-* nd/help-align-command-desc (2019-01-31) 1 commit
223
- (merged to 'next' on 2019-02-05 at 8339c1a46e)
224
- + help: align the longest command in the command listing
99
226
- Output from "git help" was not correctly aligned, which has been
227
- fixed.
100
+* nd/checkout-noisy-unmerge (2019-02-06) 2 commits
101
+ (merged to 'next' on 2019-02-06 at 7fe9bd5b4e)
102
+ + checkout: count and print -m paths separately
103
+ + checkout: update count-checkouts messages
104
105
+ "git checkout [<tree-ish>] <pathspec>" started reporting the number
106
+ of paths that have got updated recently, but the same messages were
107
+ given when "git checkout -m <pathspec>" to unresolve conflicts that
108
+ have just been resolved. The message now reports these unresolved
109
+ paths separately from the paths that are checked out from the index.
110
230
-* nd/the-index-final (2019-01-24) 11 commits
231
- (merged to 'next' on 2019-02-05 at 71b37c09a8)
232
- + cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
233
- + read-cache.c: remove the_* from index_has_changes()
234
- + merge-recursive.c: remove implicit dependency on the_repository
235
- + merge-recursive.c: remove implicit dependency on the_index
236
- + sha1-name.c: remove implicit dependency on the_index
237
- + read-cache.c: replace update_index_if_able with repo_&
238
- + read-cache.c: kill read_index()
239
- + checkout: avoid the_index when possible
240
- + repository.c: replace hold_locked_index() with repo_hold_locked_index()
241
- + notes-utils.c: remove the_repository references
242
- + grep: use grep_opt->repo instead of explict repo argument
111
244
- The assumption to work on the single "in-core index" instance has
245
- been reduced from the library-ish part of the codebase.
112
+* os/rebase-runs-post-checkout-hook (2019-02-08) 1 commit
113
+ (merged to 'next' on 2019-02-08 at da96987286)
114
+ + t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIR
115
116
+ Test fix.
117
248
-* pw/rebase-x-sanity-check (2019-01-29) 1 commit
249
- (merged to 'next' on 2019-02-05 at 9f087a617a)
250
- + rebase -x: sanity check command
118
252
- "git rebase -x $cmd" did not reject multi-line command, even though
253
- the command is incapable of handling such a command. It now is
254
- rejected upfront.
119
+* rj/sequencer-sign-off-header-static (2019-02-11) 1 commit
120
+ + sequencer: make sign_off_header a file local symbol
121
122
+ Code clean-up.
123
257
-* rj/sparse-flags (2019-02-05) 2 commits
258
- (merged to 'next' on 2019-02-05 at 7c9a7b7ee9)
259
- + Makefile: improve SPARSE_FLAGS customisation
260
- + config.mak.uname: remove obsolete SPARSE_FLAGS setting
124
262
- Use of the sparse tool got easier to customize from the command
263
- line to help developers.
125
+* sg/ci-parallel-build (2019-02-07) 2 commits
126
+ (merged to 'next' on 2019-02-07 at 8cffe5a338)
127
+ + ci: clear and mark MAKEFLAGS exported just once
128
+ + ci: make sure we build Git parallel
129
130
+ Build update.
131
266
-* sb/submodule-abort-update-upon-config-failure (2019-01-18) 1 commit
267
- (merged to 'next' on 2019-02-05 at 85da48a9a5)
268
- + git-submodule: abort if core.worktree could not be set correctly
132
270
- "git submodule update" learned to abort early when core.worktree
271
- for the submodule is not set correctly to prevent spreading damage.
133
+* sg/stress-test (2019-02-11) 2 commits
134
+ (merged to 'next' on 2019-02-11 at 1a5d4a249d)
135
+ + test-lib: fix non-portable pattern bracket expressions
136
+ (merged to 'next' on 2019-02-08 at c45c47bd7c)
137
+ + test-lib: make '--stress' more bisect-friendly
138
139
+ Test improvement.
140
274
-* sg/travis-osx-brew-breakage-workaround (2019-02-04) 1 commit
275
- (merged to 'next' on 2019-02-05 at 6a1d957040)
276
- + travis-ci: make the OSX build jobs' 'brew update' more quiet
141
278
- The way the OSX build jobs updates its build environment used the
279
- "--quiet" option to "brew update" command, but it wasn't all that
280
- quiet to be useful. The use of the option has been replaced with
281
- an explicit redirection to the /dev/null (which incidentally would
282
- have worked around a breakage by recent updates to homebrew, which
283
- has fixed itself already).
142
+* tz/gpg-test-fix (2019-02-08) 2 commits
143
+ (merged to 'next' on 2019-02-08 at 72d7fc8099)
144
+ + t/lib-gpg: drop redundant killing of gpg-agent
145
+ + t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt
146
147
+ Test fix.
148
286
-* sg/travis-specific-cc (2019-01-17) 4 commits
287
- (merged to 'next' on 2019-02-05 at 3ecb3b6755)
288
- + travis-ci: build with the right compiler
289
- + travis-ci: switch to Xcode 10.1 macOS image
290
- + travis-ci: don't be '--quiet' when running the tests
291
- + .gitignore: ignore external debug symbols from GCC on macOS
149
+--------------------------------------------------
150
+[New Topics]
151
293
- The travis CI scripts have been corrected to build Git with the
294
- compiler(s) of our choice.
152
+* dl/submodule-set-branch (2019-02-08) 3 commits
153
+ - submodule: teach set-branch subcommand
154
+ - submodule--helper: teach config subcommand --unset
155
+ - git-submodule.txt: "--branch <branch>" option defaults to 'master'
156
157
+ "git submodule" learns "set-branch" subcommand that allows the
158
+ submodule.*.branch settings to be modified.
159
297
-* sh/submodule-summary-abbrev-fix (2019-02-04) 1 commit
298
- (merged to 'next' on 2019-02-05 at b45b39c30b)
299
- + git-submodule.sh: shorten submodule SHA-1s using rev-parse
160
+ Need to attach sign-off; other than that it seems OK to be in 'next'.
161
301
- The "git submodule summary" subcommand showed shortened commit
302
- object names by mechanically truncating them at 7-hexdigit, which
303
- has been improved to let "rev-parse --short" scale the length of
304
- the abbreviation with the size of the repository.
162
163
+* jc/test-yes-doc (2019-02-11) 1 commit
164
+ (merged to 'next' on 2019-02-13 at cffac01759)
165
+ + test: caution on our version of 'yes'
166
307
-* sl/const (2019-02-04) 1 commit
308
- (merged to 'next' on 2019-02-05 at a085045a37)
309
- + various: tighten constness of some local variables
167
+ Test doc update.
168
311
- Code cleanup.
169
+ Will cook in 'next'.
170
171
314
-* ss/describe-dirty-in-the-right-directory (2019-02-04) 2 commits
315
- (merged to 'next' on 2019-02-05 at e4a3303e12)
316
- + t6120: test for describe with a bare repository
317
- + describe: setup working tree for --dirty
172
+* nd/split-index-null-base-fix (2019-02-13) 1 commit
173
+ (merged to 'next' on 2019-02-13 at c404a19b7a)
174
+ + read-cache.c: fix writing "link" index ext with null base oid
175
319
- "git --work-tree=$there --git-dir=$here describe --dirty" did not
320
- work correctly as it did not pay attention to the location of the
321
- worktree specified by the user by mistake, which has been
322
- corrected.
176
+ Split-index fix.
177
178
+ Will cook in 'next'.
179
325
-* tb/test-lint-sed-options (2019-01-28) 1 commit
326
- (merged to 'next' on 2019-02-05 at dec383d823)
327
- + test-lint: only use only sed [-n] [-e command] [-f command_file]
180
329
- The test lint learned to catch non-portable "sed" options.
181
+* rj/prune-packed-excess-args (2019-02-11) 1 commit
182
+ (merged to 'next' on 2019-02-13 at e026a2e7a7)
183
+ + prune-packed: check for too many arguments
184
185
+ "git prune-packed" did not notice and complain against excess
186
+ arguments given from the command line, which now it does.
187
332
-* tb/utf-16-le-with-explicit-bom (2019-01-31) 1 commit
333
- (merged to 'next' on 2019-02-05 at 43ac83e06e)
334
- + Support working-tree-encoding "UTF-16LE-BOM"
188
+ Will cook in 'next'.
189
336
- A new encoding UTF-16LE-BOM has been invented to force encoding to
337
- UTF-16 with BOM in little endian byte order, which cannot be directly
338
- generated by using iconv.
190
191
+* ab/workaround-dash-bug-in-test (2019-02-13) 1 commit
192
+ (merged to 'next' on 2019-02-13 at c90e329c70)
193
+ + tests: avoid syntax triggering old dash bug
194
341
-* tt/bisect-in-c (2019-01-02) 7 commits
342
- (merged to 'next' on 2019-02-05 at 1e5e00d24e)
343
- + bisect--helper: `bisect_start` shell function partially in C
344
- + bisect--helper: `get_terms` & `bisect_terms` shell function in C
345
- + bisect--helper: `bisect_next_check` shell function in C
346
- + bisect--helper: `check_and_set_terms` shell function in C
347
- + wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
348
- + bisect--helper: `bisect_write` shell function in C
349
- + bisect--helper: `bisect_reset` shell function in C
195
351
- More code in "git bisect" has been rewritten in C.
196
+* js/doc-symref-in-proto-v1 (2019-02-13) 1 commit
197
+ (merged to 'next' on 2019-02-13 at 63b673d2a6)
198
+ + protocol-capabilities.txt: document symref
199
200
--------------------------------------------------
354
-[New Topics]
201
+[Cooking]
202
203
* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit
204
(merged to 'next' on 2019-02-06 at c4e0cd535a)
@@ -363,29 +210,6 @@ of the repositories listed at
210
Will cook in 'next'.
211
212
366
-* ld/git-p4-remove-flakey-test (2019-02-06) 1 commit
367
- (merged to 'next' on 2019-02-06 at 0100bce8b6)
368
- + git-p4: remove ticket expiry test
369
-
370
- A flakey "p4" test has been removed.
371
-
372
- Will merge to 'master'.
373
-
374
-
375
-* nd/checkout-noisy-unmerge (2019-02-06) 2 commits
376
- (merged to 'next' on 2019-02-06 at 7fe9bd5b4e)
377
- + checkout: count and print -m paths separately
378
- + checkout: update count-checkouts messages
379
-
380
- "git checkout [<tree-ish>] <pathspec>" started reporting the number
381
- of paths that have got updated recently, but the same messages were
382
- given when "git checkout -m <pathspec>" to unresolve conflicts that
383
- have just been resolved. The message now reports these unresolved
384
- paths separately from the paths that are checked out from the index.
385
-
386
- Will merge to 'master'.
387
-
388
-
213
* jt/test-protocol-version (2019-02-06) 9 commits
214
- remote-curl: in v2, fill credentials if needed
215
- t5552: compensate for v2 filtering ref adv.
@@ -401,8 +225,8 @@ of the repositories listed at
225
Help developers by making it easier to run most of the tests under
226
different versions of over-the-wire protocols.
227
404
---------------------------------------------------
405
-[Cooking]
228
+ Blocked by js/protocol-advertise-multi
229
+
230
231
* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
232
- http: cast result to FILE *
@@ -414,25 +238,15 @@ of the repositories listed at
238
cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>
239
240
417
-* en/combined-all-paths (2019-02-04) 1 commit
418
- - log,diff-tree: add --combined-all-names option
241
+* en/combined-all-paths (2019-02-07) 1 commit
242
+ (merged to 'next' on 2019-02-08 at 7057f38d6e)
243
+ + log,diff-tree: add --combined-all-paths option
244
245
Output from "diff --cc" did not show the original paths when the
246
merge involved renames. A new option adds the paths in the
247
original trees to the output.
248
424
- Expecting a reroll.
425
- cf. <CABPp-BGyL5BAejK-P-EdscFdH3C6uR7e6CbgNe-9doy-mkw-vg@mail.gmail.com>
426
-
427
-
428
-* js/rebase-i-redo-exec-fix (2019-02-06) 1 commit
429
- (merged to 'next' on 2019-02-06 at 9f99bee768)
430
- + Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
431
-
432
- For "rebase -i --reschedule-failed-exec", we do not want the "-y"
433
- shortcut after all.
434
-
435
- Will merge to 'master'.
249
+ Will cook in 'next'.
250
251
252
* ds/commit-graph-format-v2 (2019-01-29) 8 commits
@@ -449,36 +263,29 @@ of the repositories listed at
263
deficiency in the initial version.
264
265
452
-* ds/coverage-prove (2019-01-29) 1 commit
453
- (merged to 'next' on 2019-02-06 at 0fc57228ec)
454
- + Makefile: add coverage-prove target
455
-
456
- A new target "coverage-prove" to run the coverage test under
457
- "prove" has been added.
458
-
459
- Will merge to 'master'.
460
-
461
-
462
-* jh/trace2 (2019-02-06) 15 commits
463
- - trace2: add for_each macros to clang-format
464
- - trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
465
- - trace2:data: add subverb for rebase
466
- - trace2:data: add subverb to reset command
467
- - trace2:data: add subverb to checkout command
468
- - trace2:data: pack-objects: add trace2 regions
469
- - trace2:data: add trace2 instrumentation to index read/write
470
- - trace2:data: add trace2 hook classification
471
- - trace2:data: add trace2 transport child classification
472
- - trace2:data: add trace2 sub-process classification
473
- - trace2:data: add editor/pager child classification
474
- - trace2:data: add trace2 regions to wt-status
475
- - trace2: collect Windows-specific process information
476
- - trace2: create new combined trace facility
477
- - trace2: Documentation/technical/api-trace2.txt
266
+* jh/trace2 (2019-02-11) 16 commits
267
+ (merged to 'next' on 2019-02-11 at 25fb2164ff)
268
+ + fixup! trace2: collect Windows-specific process information
269
+ (merged to 'next' on 2019-02-08 at 0253db7fff)
270
+ + trace2: add for_each macros to clang-format
271
+ + trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
272
+ + trace2:data: add subverb for rebase
273
+ + trace2:data: add subverb to reset command
274
+ + trace2:data: add subverb to checkout command
275
+ + trace2:data: pack-objects: add trace2 regions
276
+ + trace2:data: add trace2 instrumentation to index read/write
277
+ + trace2:data: add trace2 hook classification
278
+ + trace2:data: add trace2 transport child classification
279
+ + trace2:data: add trace2 sub-process classification
280
+ + trace2:data: add editor/pager child classification
281
+ + trace2:data: add trace2 regions to wt-status
282
+ + trace2: collect Windows-specific process information
283
+ + trace2: create new combined trace facility
284
+ + trace2: Documentation/technical/api-trace2.txt
285
286
A more structured way to obtain execution trace has been added.
287
481
- Will merge to 'next'.
288
+ Will cook in 'next'.
289
290
291
* sx/evolve (2019-01-27) 8 commits
@@ -494,16 +301,17 @@ of the repositories listed at
301
The beginning of "hg evolve" mimicry.
302
303
497
-* br/blame-ignore (2019-01-18) 3 commits
304
+* br/blame-ignore (2019-02-13) 6 commits
305
+ - SQUASH???
306
+ - blame: add tests for ignoring revisions
307
- blame: add a config option to mark ignored lines
308
- blame: add the ability to ignore commits and their changes
309
+ - blame: use a helper function in blame_chunk()
310
- Move init_skiplist() outside of fsck
311
312
"git blame" learned to "ignore" commits in the history, whose
313
effects (as well as their presence) get ignored.
314
505
- Is this ready for 'next'?
506
-
315
316
* nd/diff-parseopt (2019-01-27) 14 commits
317
(merged to 'next' on 2019-02-05 at 7c4b79aa79)
@@ -532,17 +340,18 @@ of the repositories listed at
340
341
342
* sc/pack-redundant (2019-02-04) 6 commits
535
- - pack-redundant: consistent sort method
536
- - pack-redundant: rename pack_list.all_objects
537
- - pack-redundant: new algorithm to find min packs
538
- - pack-redundant: delete redundant code
539
- - pack-redundant: delay creation of unique_objects
540
- - t5323: test cases for git-pack-redundant
343
+ (merged to 'next' on 2019-02-08 at ba3f8f0bc0)
344
+ + pack-redundant: consistent sort method
345
+ + pack-redundant: rename pack_list.all_objects
346
+ + pack-redundant: new algorithm to find min packs
347
+ + pack-redundant: delete redundant code
348
+ + pack-redundant: delay creation of unique_objects
349
+ + t5323: test cases for git-pack-redundant
350
351
Update the implementation of pack-redundant for performance in a
352
repository with many packfiles.
353
545
- Will merge to 'next'.
354
+ Will cook in 'next'.
355
356
357
* nd/config-move-to (2019-01-14) 7 commits
@@ -682,17 +491,8 @@ of the repositories listed at
491
listing the protocol versions it is willing to talk, and the other
492
side choosing from one of them.
493
685
-
686
-* js/smart-http-detect-remote-error (2019-02-06) 3 commits
687
- (merged to 'next' on 2019-02-06 at ec1a6f67c1)
688
- + t5551: test server-side ERR packet
689
- + remote-curl: tighten "version 2" check for smart-http
690
- + remote-curl: refactor smart-http discovery
691
-
692
- Some errors from the other side coming over smart HTTP transport
693
- were not noticed, which has been corrected.
694
-
695
- Will merge to 'master'.
494
+ Expecting a reroll.
495
+ cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
496
497
498
* nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
@@ -710,11 +510,12 @@ of the repositories listed at
510
511
512
* du/branch-show-current (2018-10-26) 1 commit
713
- - branch: introduce --show-current display option
513
+ (merged to 'next' on 2019-02-08 at e662ed4aee)
514
+ + branch: introduce --show-current display option
515
516
"git branch" learned a new subcommand "--show-current".
517
717
- Will merge to 'next'.
518
+ Will cook in 'next'.
519
520
521
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
@@ -752,6 +553,7 @@ of the repositories listed at
553
554
Still being worked on.
555
cf. <c5e3c1cc-12fa-ddf6-7008-ae47659ddc19@gmail.com>
556
+ cf. <97f77aca-bd19-f763-349a-de40c4b94161@talktalk.net>
557
558
559
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
@@ -797,7 +599,8 @@ of the repositories listed at
599
600
"git stash" rewritten in C.
601
800
- Will merge to 'next'.
602
+ Still with known breakages.
603
+ cf. <20190208113059.GV10587@szeder.dev>
604
605
606
* pw/add-p-select (2018-07-26) 4 commits