What's cooking (2020/05 #01)
Junio C Hamano committed
May 1, 2020 at 15:07 UTC
139372b246fd2733974556f8ba916e06ec33b169
1 file changed
+264
-396
whats-cooking.txt
+264
-396
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2020, #04; Thu, 30)
4
-X-master-at: d61d20c9b413225793f8a0b491bbbec61c184e26
5
-X-next-at: e9eca65c58678cd6523f72e8b97b77f978a3477e
3
+Subject: What's cooking in git.git (May 2020, #01; Fri, 1)
4
+X-master-at: b34789c0b0d3b137f0bb516b417bd8d75e0cb306
5
+X-next-at: 232c24e857ed6ddde51b0435add1905f58948aec
6
7
-What's cooking in git.git (Apr 2020, #04; Thu, 30)
7
+What's cooking in git.git (May 2020, #01; Fri, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +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
-Quite a few topics have been merged to 'next' and also to 'master'.
16
-There are a few more important topics that need to be merged down to
17
-'master' before we're comfortable cutting the next maintenance
18
-update but hopefully we'd get there during this week.
15
+The sixth batch merged quite a few topics to 'master'; they haven't
16
+spent the usual "at least a week" in the 'next' branch, but all of
17
+them looked quite safe and benign. Knock wood.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -25,149 +24,253 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
28
-* dd/ci-musl-libc (2020-04-06) 6 commits
29
- + travis: build and test on Linux with musl libc and busybox
30
- + ci/linux32: libify install-dependencies step
31
- + ci: refactor docker runner script
32
- + ci/linux32: parameterise command to switch arch
33
- + ci/lib-docker: preserve required environment variables
34
- + ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
35
- (this branch is used by dd/ci-swap-azure-pipelines-with-github-actions.)
36
-
37
- A new CI job to build and run test suite on linux with musl libc
38
- has been added.
39
-
40
-
41
-* dd/ci-swap-azure-pipelines-with-github-actions (2020-04-10) 14 commits
42
- (merged to 'next' on 2020-04-20 at 40d0486c23)
43
- + ci: let GitHub Actions upload failed tests' directories
44
- + ci: add a problem matcher for GitHub Actions
45
- + tests: when run in Bash, annotate test failures with file name/line number
46
- + ci: retire the Azure Pipelines definition
47
- + README: add a build badge for the GitHub Actions runs
48
- + ci: configure GitHub Actions for CI/PR
49
- + ci: run gem with sudo to install asciidoctor
50
- + ci: explicit install all required packages
51
- + ci: fix the `jobname` of the `GETTEXT_POISON` job
52
- + ci/lib: set TERM environment variable if not exist
53
- + ci/lib: allow running in GitHub Actions
54
- + ci/lib: if CI type is unknown, show the environment variables
55
- + Merge branch 'dd/ci-musl-libc' into HEAD
56
- + Merge branch 'dd/test-with-busybox' into HEAD
57
- (this branch uses dd/ci-musl-libc.)
58
-
59
- Update the CI configuration to use GitHub Actions, retiring the one
60
- based on Azure Pipelines.
61
-
62
- Will merge to 'master', together with dd/ci-musl-libc.
63
-
64
-
65
-* dl/merge-autostash (2020-04-10) 22 commits
66
- (merged to 'next' on 2020-04-22 at 98b991e8f5)
67
- + pull: pass --autostash to merge
68
- + t5520: make test_pull_autostash() accept expect_parent_num
69
- + merge: teach --autostash option
70
- + sequencer: implement apply_autostash_oid()
71
- + sequencer: implement save_autostash()
72
- + sequencer: unlink autostash in apply_autostash()
73
- + sequencer: extract perform_autostash() from rebase
74
- + rebase: generify create_autostash()
75
- + rebase: extract create_autostash()
76
- + reset: extract reset_head() from rebase
77
- + rebase: generify reset_head()
78
- + rebase: use apply_autostash() from sequencer.c
79
- + sequencer: rename stash_sha1 to stash_oid
80
- + sequencer: make apply_autostash() accept a path
81
- + rebase: use read_oneliner()
82
- + sequencer: make read_oneliner() extern
83
- + sequencer: configurably warn on non-existent files
84
- + sequencer: make read_oneliner() accept flags
85
- + sequencer: make file exists check more efficient
86
- + sequencer: stop leaking buf
87
- + t7600: use test_write_lines()
88
- + Makefile: ASCII-sort += lists
89
- (this branch is used by dl/merge-autostash-rebase-quit-fix.)
90
-
91
- "git merge" learns the "--autostash" option.
92
-
93
- Will merge to 'master' together with the "rebase --quit" fix.
94
-
95
-
96
-* dl/merge-autostash-rebase-quit-fix (2020-04-28) 1 commit
97
- (merged to 'next' on 2020-04-28 at 24dcf3edc1)
98
- + rebase: save autostash entry into stash reflog on --quit
99
- (this branch uses dl/merge-autostash.)
100
-
101
- The stash entry created by "git rebase --autosquash" to keep the
102
- initial dirty state were discarded by mistake upon "git rebase
103
- --quit", which has been corrected.
104
-
105
-
106
-* en/fill-directory-exponential (2020-04-01) 12 commits
107
- (merged to 'next' on 2020-04-22 at e2577e3dc9)
108
- + completion: fix 'git add' on paths under an untracked directory
109
- + Fix error-prone fill_directory() API; make it only return matches
110
- + dir: replace double pathspec matching with single in treat_directory()
111
- + dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()
112
- + dir: replace exponential algorithm with a linear one
113
- + dir: refactor treat_directory to clarify control flow
114
- + dir: fix confusion based on variable tense
115
- + dir: fix broken comment
116
- + dir: consolidate treat_path() and treat_one_path()
117
- + dir: fix simple typo in comment
118
- + t3000: add more testcases testing a variety of ls-files issues
119
- + t7063: more thorough status checking
120
-
121
- The directory traversal code had redundant recursive calls which
122
- made its performance characteristics exponential with respect to
123
- the depth of the tree, which was corrected.
124
-
125
-
126
-* en/sparse-checkout (2020-03-27) 18 commits
127
- (merged to 'next' on 2020-04-15 at 3e295e445d)
128
- + sparse-checkout: provide a new reapply subcommand
129
- + unpack-trees: failure to set SKIP_WORKTREE bits always just a warning
130
- + unpack-trees: provide warnings on sparse updates for unmerged paths too
131
- + unpack-trees: make sparse path messages sound like warnings
132
- + unpack-trees: split display_error_msgs() into two
133
- + unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*
134
- + unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier
135
- + sparse-checkout: use improved unpack_trees porcelain messages
136
- + sparse-checkout: use new update_sparsity() function
137
- + unpack-trees: add a new update_sparsity() function
138
- + unpack-trees: pull sparse-checkout pattern reading into a new function
139
- + unpack-trees: do not mark a dirty path with SKIP_WORKTREE
140
- + unpack-trees: allow check_updates() to work on a different index
141
- + t1091: make some tests a little more defensive against failures
142
- + unpack-trees: simplify pattern_list freeing
143
- + unpack-trees: simplify verify_absent_sparse()
144
- + unpack-trees: remove unused error type
145
- + unpack-trees: fix minor typo in comment
146
-
147
- "sparse-checkout" UI improvements.
148
-
149
-
150
-* ps/transactional-update-ref-stdin (2020-04-02) 9 commits
151
- (merged to 'next' on 2020-04-22 at 5c92add109)
152
- + update-ref: implement interactive transaction handling
153
- + update-ref: read commands in a line-wise fashion
154
- + update-ref: move transaction handling into `update_refs_stdin()`
155
- + update-ref: pass end pointer instead of strbuf
156
- + update-ref: drop unused argument for `parse_refname`
157
- + update-ref: organize commands in an array
158
- + strbuf: provide function to append whole lines
159
- + git-update-ref.txt: add missing word
160
- + refs: fix segfault when aborting empty transaction
161
-
162
- "git update-ref --stdin" learned a handful of new verbs to let the
163
- user control ref update transactions more explicitly, which helps
164
- as an ingredient to implement two-phase commit-style atomic
165
- ref-updates across multiple repositories.
27
+* dd/mailinfo-with-nul (2020-04-22) 3 commits
28
+ (merged to 'next' on 2020-04-28 at b1d3e40d49)
29
+ + mailinfo: disallow NUL character in mail's header
30
+ + mailinfo.c: avoid strlen on strings that can contains NUL
31
+ + t4254: merge 2 steps of a single test
32
+
33
+ Tighten "git mailinfo" to notice and error out when decoded result
34
+ contains NUL in it.
35
+
36
+
37
+* dd/sparse-fixes (2020-04-27) 4 commits
38
+ (merged to 'next' on 2020-04-28 at d809f916ee)
39
+ + progress.c: silence cgcc suggestion about internal linkage
40
+ + graph.c: limit linkage of internal variable
41
+ + compat/regex: move stdlib.h up in inclusion chain
42
+ + test-parse-pathspec-file.c: s/0/NULL/ for pointer type
43
+
44
+ Compilation fix.
45
+
46
+
47
+* dl/test-must-fail-fixes-4 (2020-04-20) 7 commits
48
+ (merged to 'next' on 2020-04-28 at 6f4804aa09)
49
+ + t9819: don't use test_must_fail with p4
50
+ + t9164: use test_must_fail only on git commands
51
+ + t9160: use test_path_is_missing()
52
+ + t9141: use test_path_is_missing()
53
+ + t7508: don't use `test_must_fail test_cmp`
54
+ + t7408: replace incorrect uses of test_must_fail
55
+ + t6030: use test_path_is_missing()
56
+
57
+ Test clean-up.
58
+
59
+
60
+* ds/blame-on-bloom (2020-04-23) 6 commits
61
+ (merged to 'next' on 2020-04-28 at 6152eb2eb3)
62
+ + test-bloom: check that we have expected arguments
63
+ + test-bloom: fix some whitespace issues
64
+ + blame: drop unused parameter from maybe_changed_path
65
+ (merged to 'next' on 2020-04-22 at dc4f24e54b)
66
+ + blame: use changed-path Bloom filters
67
+ + tests: write commit-graph with Bloom filters
68
+ + revision: complicated pathspecs disable filters
69
+ (this branch is used by ds/line-log-on-bloom; uses gs/commit-graph-path-filter.)
70
+
71
+ "git blame" learns to take advantage of the "changed-paths" Bloom
72
+ filter stored in the commit-graph file.
73
+
74
+
75
+* ds/build-homebrew-gettext-fix (2020-04-27) 1 commit
76
+ (merged to 'next' on 2020-04-28 at 70c6eca470)
77
+ + macOS/brew: let the build find gettext headers/libraries/msgfmt
78
+
79
+ Recent update to Homebrew used by macOS folks breaks build by
80
+ moving gettext library and necessary headers.
81
+
82
+
83
+* ds/multi-pack-index (2020-04-24) 1 commit
84
+ (merged to 'next' on 2020-04-28 at b8f9691cbc)
85
+ + multi-pack-index: close file descriptor after mmap
86
+
87
+ The multi-pack-index left mmapped file descriptors open when it
88
+ does not have to.
89
+
90
+
91
+* eb/gitweb-more-trailers (2020-04-24) 1 commit
92
+ (merged to 'next' on 2020-04-28 at 7b16ac0810)
93
+ + gitweb: Recognize *-to and Closes/Fixes trailers
94
+
95
+ Gitweb updates.
96
+
97
+
98
+* en/rebase-root-and-fork-point-are-incompatible (2020-04-27) 1 commit
99
+ (merged to 'next' on 2020-04-28 at 8ea4882905)
100
+ + rebase: display an error if --root and --fork-point are both provided
101
+
102
+ Incompatible options "--root" and "--fork-point" of "git rebase"
103
+ have been marked and documented as being incompatible.
104
+
105
+
106
+* es/bugreport (2020-04-27) 6 commits
107
+ (merged to 'next' on 2020-04-28 at fdfd36a5d7)
108
+ + bugreport: drop extraneous includes
109
+ (merged to 'next' on 2020-04-22 at f5a2ab988e)
110
+ + bugreport: add compiler info
111
+ + bugreport: add uname info
112
+ + bugreport: gather git version and build info
113
+ + bugreport: add tool to generate debugging info
114
+ + help: move list_config_help to builtin/help
115
+ (this branch is used by es/bugreport-with-hooks.)
116
+
117
+ The "bugreport" tool.
118
+
119
+
120
+* gs/commit-graph-path-filter (2020-04-09) 16 commits
121
+ (merged to 'next' on 2020-04-22 at 34b35f43bd)
122
+ + bloom: ignore renames when computing changed paths
123
+ + commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag
124
+ + t4216: add end to end tests for git log with Bloom filters
125
+ + revision.c: add trace2 stats around Bloom filter usage
126
+ + revision.c: use Bloom filters to speed up path based revision walks
127
+ + commit-graph: add --changed-paths option to write subcommand
128
+ + commit-graph: reuse existing Bloom filters during write
129
+ + commit-graph: write Bloom filters to commit graph file
130
+ + commit-graph: examine commits by generation number
131
+ + commit-graph: examine changed-path objects in pack order
132
+ + commit-graph: compute Bloom filters for changed paths
133
+ + diff: halt tree-diff early after max_changes
134
+ + bloom.c: core Bloom filter implementation for changed paths.
135
+ + bloom.c: introduce core Bloom filter constructs
136
+ + bloom.c: add the murmur3 hash implementation
137
+ + commit-graph: define and use MAX_NUM_CHUNKS
138
+ (this branch is used by ds/blame-on-bloom and ds/line-log-on-bloom.)
139
+
140
+ Introduce an extension to the commit-graph to make it efficient to
141
+ check for the paths that were modified at each commit using Bloom
142
+ filters.
143
+
144
+
145
+* jk/build-with-right-curl (2020-04-05) 3 commits
146
+ (merged to 'next' on 2020-04-28 at 1718c25b44)
147
+ + Makefile: avoid running curl-config unnecessarily
148
+ + Makefile: use curl-config --cflags
149
+ + Makefile: avoid running curl-config multiple times
150
+
151
+ The build procedure did not use the libcurl library and its include
152
+ files correctly for a custom-built installation.
153
+ cf. <20200428033611.GB2369457@coredump.intra.peff.net>
154
+
155
+
156
+* js/anonymise-push-url-in-errors (2020-04-28) 1 commit
157
+ (merged to 'next' on 2020-04-28 at 49539cf116)
158
+ + push: anonymize URLs in error messages and warnings
159
+
160
+ Error and verbose trace messages from "git push" did not redact
161
+ credential material embedded in URLs.
162
+
163
+
164
+* jt/v2-fetch-nego-fix (2020-04-28) 3 commits
165
+ (merged to 'next' on 2020-04-28 at c6f9ebf2f7)
166
+ + fetch-pack: in protocol v2, reset in_vain upon ACK
167
+ + fetch-pack: in protocol v2, in_vain only after ACK
168
+ + fetch-pack: return enum from process_acks()
169
+
170
+ The upload-pack protocol v2 gave up too early before finding a
171
+ common ancestor, resulting in a wasteful fetch from a fork of a
172
+ project. This has been corrected to match the behaviour of v0
173
+ protocol.
174
+
175
+
176
+* mt/doc-worktree-ref (2020-04-24) 1 commit
177
+ (merged to 'next' on 2020-04-28 at d96c05cb0a)
178
+ + config doc: fix reference to config.worktree info
179
+
180
+ Docfix.
181
+
182
+
183
+* tb/commit-graph-fd-exhaustion-fix (2020-04-24) 4 commits
184
+ (merged to 'next' on 2020-04-28 at 6d5fd6bc49)
185
+ + commit-graph: close descriptors after mmap
186
+ + commit-graph.c: gracefully handle file descriptor exhaustion
187
+ + t/test-lib.sh: make ULIMIT_FILE_DESCRIPTORS available to tests
188
+ + commit-graph.c: don't use discarded graph_name in error
189
+ (this branch is tangled with tb/commit-graph-split-strategy.)
190
+
191
+ The commit-graph code exhausted file descriptors easily when it
192
+ does not have to.
193
+
194
+
195
+* tb/commit-graph-split-strategy (2020-04-29) 8 commits
196
+ (merged to 'next' on 2020-04-29 at 99fa922569)
197
+ + Revert "commit-graph.c: introduce '--[no-]check-oids'"
198
+ + commit-graph.c: introduce '--[no-]check-oids'
199
+ + commit-graph.h: replace 'commit_hex' with 'commits'
200
+ + oidset: introduce 'oidset_size'
201
+ + builtin/commit-graph.c: introduce split strategy 'replace'
202
+ + builtin/commit-graph.c: introduce split strategy 'no-merge'
203
+ + builtin/commit-graph.c: support for '--split[=<strategy>]'
204
+ + t/helper/test-read-graph.c: support commit-graph chains
205
+ (this branch is tangled with tb/commit-graph-fd-exhaustion-fix.)
206
+
207
+ "git commit-graph write" learned different ways to write out split
208
+ files.
209
+
210
+
211
+* tb/reset-shallow (2020-04-24) 2 commits
212
+ (merged to 'next' on 2020-04-28 at 9510639ae8)
213
+ + shallow.c: use '{commit,rollback}_shallow_file'
214
+ + t5537: use test_write_lines and indented heredocs for readability
215
+ (this branch is used by tb/shallow-cleanup.)
216
+
217
+ Fix in-core inconsistency after fetching into a shallow repository
218
+ that broke the code to write out commit-graph.
219
220
--------------------------------------------------
221
[New Topics]
222
170
-* cb/credential-store-warn-bogus-lines (2020-04-28) 2 commits
223
+* ds/line-log-on-bloom (2020-05-01) 12 commits
224
+ - line-log: integrate with changed-path Bloom filters
225
+ - line-log: try to use generation number-based topo-ordering
226
+ - line-log: more responsive, incremental 'git log -L'
227
+ - t4211-line-log: add tests for parent oids
228
+ - line-log: remove unused fields from 'struct line_log_data'
229
+ - completion: offer '--(no-)patch' among 'git log' options
230
+ - bloom: use num_changes not nr for limit detection
231
+ - bloom: parse commit before computing filters
232
+ - bloom: de-duplicate directory entries
233
+ - Documentation: changed-path Bloom filters use byte words
234
+ - test-bloom: fix usage typo
235
+ - bloom: fix whitespace around tab length
236
+
237
+ "git log -L..." now takes advantage of the "which paths are touched
238
+ by this commit?" info stored in the commit-graph system.
239
+
240
+
241
+* es/restore-staged-from-head-by-default (2020-05-01) 3 commits
242
+ - restore: default to HEAD when combining --worktree and --staged
243
+ - fixup! restore: require --source when combining --worktree and --staged
244
+ - restore: require --source when combining --worktree and --staged
245
+
246
+ "git restore --staged --worktree" now defaults to take the contents
247
+ out of "HEAD", instead of erroring out.
248
+
249
+
250
+* jk/credential-sample-update (2020-05-01) 2 commits
251
+ - gitcredentials(7): make shell-snippet example more realistic
252
+ - gitcredentials(7): clarify quoting of helper examples
253
+
254
+ The samples in the credential documentation has been updated to
255
+ make it clear that we depict what would appear in the .git/config
256
+ file, by adding appropriate quotes as needed..
257
+
258
+ Will merge to 'next'.
259
+
260
+--------------------------------------------------
261
+[Stalled]
262
+
263
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
264
+ - zlib.c: use size_t for size
265
+
266
+ The wrapper to call into zlib followed our long tradition to use
267
+ "unsigned long" for sizes of regions in memory, which have been
268
+ updated to use "size_t".
269
+
270
+--------------------------------------------------
271
+[Cooking]
272
+
273
+* cb/credential-store-warn-bogus-lines (2020-04-30) 2 commits
274
- credential-store: warn instead of fatal for bogus lines from store
275
- credential-store: document the file format a bit more
276
@@ -177,6 +280,11 @@ of the repositories listed at
280
die, which is a bit too harsh to the users. Demote the error
281
behaviour to only warn and keep using well-formed lines instead.
282
283
+ Expecting a final reroll.
284
+ It seems that we decided to do absolute minimum to avoid doing any
285
+ unnecessary harm. Ignore malformed lines but without warning.
286
+ cf. <20200501135757.GF33264@Carlos-MBP>
287
+
288
289
* dl/switch-c-option-in-error-message (2020-04-30) 1 commit
290
- switch: fix errors and comments related to -c and -C
@@ -191,7 +299,6 @@ of the repositories listed at
299
* es/bugreport-with-hooks (2020-04-30) 2 commits
300
- SQUASH???
301
- bugreport: collect list of populated hooks
194
- (this branch uses es/bugreport.)
302
303
"git bugreport" learned to report enabled hooks in the repository.
304
@@ -203,24 +310,11 @@ of the repositories listed at
310
- shallow.h: document '{commit,rollback}_shallow_file'
311
- shallow: extract a header file for shallow-related functions
312
- commit: make 'commit_graft_pos' non-static
206
- (this branch uses tb/reset-shallow.)
313
314
Code cleanup.
315
316
Will merge to 'next'.
317
212
---------------------------------------------------
213
-[Stalled]
214
-
215
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
216
- - zlib.c: use size_t for size
217
-
218
- The wrapper to call into zlib followed our long tradition to use
219
- "unsigned long" for sizes of regions in memory, which have been
220
- updated to use "size_t".
221
-
222
---------------------------------------------------
223
-[Cooking]
318
319
* bc/wildcard-credential (2020-04-27) 1 commit
320
(merged to 'next' on 2020-04-28 at 1a0d6b91dc)
@@ -232,18 +326,6 @@ of the repositories listed at
326
Will merge to 'master'.
327
328
235
-* dd/mailinfo-with-nul (2020-04-22) 3 commits
236
- (merged to 'next' on 2020-04-28 at b1d3e40d49)
237
- + mailinfo: disallow NUL character in mail's header
238
- + mailinfo.c: avoid strlen on strings that can contains NUL
239
- + t4254: merge 2 steps of a single test
240
-
241
- Tighten "git mailinfo" to notice and error out when decoded result
242
- contains NUL in it.
243
-
244
- Will merge to 'master'.
245
-
246
-
329
* ah/userdiff-markdown (2020-04-30) 1 commit
330
- userdiff: support Markdown
331
@@ -252,18 +334,6 @@ of the repositories listed at
334
Will merge to 'next'.
335
336
255
-* dd/sparse-fixes (2020-04-27) 4 commits
256
- (merged to 'next' on 2020-04-28 at d809f916ee)
257
- + progress.c: silence cgcc suggestion about internal linkage
258
- + graph.c: limit linkage of internal variable
259
- + compat/regex: move stdlib.h up in inclusion chain
260
- + test-parse-pathspec-file.c: s/0/NULL/ for pointer type
261
-
262
- Compilation fix.
263
-
264
- Will merge to 'master'.
265
-
266
-
337
* mr/bisect-in-c-2 (2020-04-23) 12 commits
338
- bisect--helper: retire `--bisect-autostart` subcommand
339
- bisect--helper: retire `--write-terms` subcommand
@@ -283,103 +353,30 @@ of the repositories listed at
353
Any volunteer to review this?
354
355
286
-* tb/reset-shallow (2020-04-24) 2 commits
287
- (merged to 'next' on 2020-04-28 at 9510639ae8)
288
- + shallow.c: use '{commit,rollback}_shallow_file'
289
- + t5537: use test_write_lines and indented heredocs for readability
290
- (this branch is used by tb/shallow-cleanup.)
291
-
292
- Fix in-core inconsistency after fetching into a shallow repository
293
- that broke the code to write out commit-graph.
294
-
295
- Will merge to 'master'.
296
-
297
-
298
-* ds/build-homebrew-gettext-fix (2020-04-27) 1 commit
299
- (merged to 'next' on 2020-04-28 at 70c6eca470)
300
- + macOS/brew: let the build find gettext headers/libraries/msgfmt
301
-
302
- Recent update to Homebrew used by macOS folks breaks build by
303
- moving gettext library and necessary headers.
304
-
305
- Will merge to 'master'.
306
-
307
-
308
-* tb/commit-graph-fd-exhaustion-fix (2020-04-24) 4 commits
309
- (merged to 'next' on 2020-04-28 at 6d5fd6bc49)
310
- + commit-graph: close descriptors after mmap
311
- + commit-graph.c: gracefully handle file descriptor exhaustion
312
- + t/test-lib.sh: make ULIMIT_FILE_DESCRIPTORS available to tests
313
- + commit-graph.c: don't use discarded graph_name in error
314
- (this branch is tangled with tb/commit-graph-split-strategy.)
315
-
316
- The commit-graph code exhausted file descriptors easily when it
317
- does not have to.
318
-
319
- Will merge to 'master'.
320
-
321
-
322
-* ds/multi-pack-index (2020-04-24) 1 commit
323
- (merged to 'next' on 2020-04-28 at b8f9691cbc)
324
- + multi-pack-index: close file descriptor after mmap
325
-
326
- The multi-pack-index left mmapped file descriptors open when it
327
- does not have to.
328
-
329
- Will merge to 'master'.
330
-
331
-
332
-* js/anonymise-push-url-in-errors (2020-04-28) 1 commit
333
- (merged to 'next' on 2020-04-28 at 49539cf116)
334
- + push: anonymize URLs in error messages and warnings
335
-
336
- Error and verbose trace messages from "git push" did not redact
337
- credential material embedded in URLs.
338
-
339
- Will merge to 'master'.
340
-
341
-
356
* js/partial-urlmatch-2.17 (2020-04-29) 3 commits
343
- - credential: handle `credential.<partial-URL>.<key>` again
344
- - credential: optionally allow partial URLs in credential_from_url_gently()
345
- - credential: fix grammar
357
+ (merged to 'next' on 2020-05-01 at 7c69571f89)
358
+ + credential: handle `credential.<partial-URL>.<key>` again
359
+ + credential: optionally allow partial URLs in credential_from_url_gently()
360
+ + credential: fix grammar
361
(this branch is used by js/partial-urlmatch.)
362
363
Recent updates broke parsing of "credential.<url>.<key>" where
364
<url> is not a full URL (e.g. [credential "https://"] helper = ...)
365
stopped working, which has been corrected.
366
352
- Will merge to 'next'.
367
+ Will merge to 'master'.
368
369
370
* js/partial-urlmatch (2020-04-29) 3 commits
356
- - Sync with js/partial-urlmatch-2.17
357
- - credential: handle `credential.<partial-URL>.<key>` again
358
- - credential: optionally allow partial URLs in credential_from_url_gently()
371
+ (merged to 'next' on 2020-05-01 at e7017fcfd1)
372
+ + Sync with js/partial-urlmatch-2.17
373
+ + credential: handle `credential.<partial-URL>.<key>` again
374
+ + credential: optionally allow partial URLs in credential_from_url_gently()
375
(this branch uses js/partial-urlmatch-2.17.)
376
377
The same as js/partial-urlmatch-2.17, built on more recent codebase
378
to avoid unnecessary merge conflicts.
379
364
- Will merge to 'next'.
365
-
366
-
367
-* eb/gitweb-more-trailers (2020-04-24) 1 commit
368
- (merged to 'next' on 2020-04-28 at 7b16ac0810)
369
- + gitweb: Recognize *-to and Closes/Fixes trailers
370
-
371
- Gitweb updates.
372
-
373
- Will merge to 'master'.
374
-
375
-
376
-* en/rebase-root-and-fork-point-are-incompatible (2020-04-27) 1 commit
377
- (merged to 'next' on 2020-04-28 at 8ea4882905)
378
- + rebase: display an error if --root and --fork-point are both provided
379
-
380
- Incompatible options "--root" and "--fork-point" of "git rebase"
381
- have been marked and documented as being incompatible.
382
-
380
Will merge to 'master'.
381
382
@@ -400,29 +397,6 @@ of the repositories listed at
397
options that the "git switch" command takes.
398
399
403
-* jt/v2-fetch-nego-fix (2020-04-28) 3 commits
404
- (merged to 'next' on 2020-04-28 at c6f9ebf2f7)
405
- + fetch-pack: in protocol v2, reset in_vain upon ACK
406
- + fetch-pack: in protocol v2, in_vain only after ACK
407
- + fetch-pack: return enum from process_acks()
408
-
409
- The upload-pack protocol v2 gave up too early before finding a
410
- common ancestor, resulting in a wasteful fetch from a fork of a
411
- project. This has been corrected to match the behaviour of v0
412
- protocol.
413
-
414
- Will merge to 'master'.
415
-
416
-
417
-* mt/doc-worktree-ref (2020-04-24) 1 commit
418
- (merged to 'next' on 2020-04-28 at d96c05cb0a)
419
- + config doc: fix reference to config.worktree info
420
-
421
- Docfix.
422
-
423
- Will merge to 'master'.
424
-
425
-
400
* tb/commit-graph-perm-bits (2020-04-29) 5 commits
401
(merged to 'next' on 2020-04-29 at 66a87c1fbc)
402
+ commit-graph.c: make 'commit-graph-chain's read-only
@@ -478,21 +452,6 @@ of the repositories listed at
452
cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
453
454
481
-* dl/test-must-fail-fixes-4 (2020-04-20) 7 commits
482
- (merged to 'next' on 2020-04-28 at 6f4804aa09)
483
- + t9819: don't use test_must_fail with p4
484
- + t9164: use test_must_fail only on git commands
485
- + t9160: use test_path_is_missing()
486
- + t9141: use test_path_is_missing()
487
- + t7508: don't use `test_must_fail test_cmp`
488
- + t7408: replace incorrect uses of test_must_fail
489
- + t6030: use test_path_is_missing()
490
-
491
- Test clean-up.
492
-
493
- Will merge to 'master'.
494
-
495
-
455
* pw/rebase-i-more-options (2020-04-29) 5 commits
456
- rebase: add --reset-author-date
457
- rebase -i: support --ignore-date
@@ -503,23 +462,6 @@ of the repositories listed at
462
"git rebase -i" learns a bit more options.
463
464
506
-* ds/blame-on-bloom (2020-04-23) 6 commits
507
- (merged to 'next' on 2020-04-28 at 6152eb2eb3)
508
- + test-bloom: check that we have expected arguments
509
- + test-bloom: fix some whitespace issues
510
- + blame: drop unused parameter from maybe_changed_path
511
- (merged to 'next' on 2020-04-22 at dc4f24e54b)
512
- + blame: use changed-path Bloom filters
513
- + tests: write commit-graph with Bloom filters
514
- + revision: complicated pathspecs disable filters
515
- (this branch uses gs/commit-graph-path-filter.)
516
-
517
- "git blame" learns to take advantage of the "changed-paths" Bloom
518
- filter stored in the commit-graph file.
519
-
520
- Will merge to 'master', together with gs/commit-graph-path-filter.
521
-
522
-
465
* dd/iso-8601-updates (2020-04-24) 4 commits
466
(merged to 'next' on 2020-04-28 at 18fba39171)
467
+ date.c: allow compact version of ISO-8601 datetime
@@ -532,51 +474,6 @@ of the repositories listed at
474
Will merge to 'master'.
475
476
535
-* tb/commit-graph-split-strategy (2020-04-29) 8 commits
536
- (merged to 'next' on 2020-04-29 at 99fa922569)
537
- + Revert "commit-graph.c: introduce '--[no-]check-oids'"
538
- + commit-graph.c: introduce '--[no-]check-oids'
539
- + commit-graph.h: replace 'commit_hex' with 'commits'
540
- + oidset: introduce 'oidset_size'
541
- + builtin/commit-graph.c: introduce split strategy 'replace'
542
- + builtin/commit-graph.c: introduce split strategy 'no-merge'
543
- + builtin/commit-graph.c: support for '--split[=<strategy>]'
544
- + t/helper/test-read-graph.c: support commit-graph chains
545
- (this branch is tangled with tb/commit-graph-fd-exhaustion-fix.)
546
-
547
- "git commit-graph write" learned different ways to write out split
548
- files.
549
-
550
- Will merge to 'master' together with tb/commit-graph-fd-exhaustion-fix
551
-
552
-
553
-* gs/commit-graph-path-filter (2020-04-09) 16 commits
554
- (merged to 'next' on 2020-04-22 at 34b35f43bd)
555
- + bloom: ignore renames when computing changed paths
556
- + commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag
557
- + t4216: add end to end tests for git log with Bloom filters
558
- + revision.c: add trace2 stats around Bloom filter usage
559
- + revision.c: use Bloom filters to speed up path based revision walks
560
- + commit-graph: add --changed-paths option to write subcommand
561
- + commit-graph: reuse existing Bloom filters during write
562
- + commit-graph: write Bloom filters to commit graph file
563
- + commit-graph: examine commits by generation number
564
- + commit-graph: examine changed-path objects in pack order
565
- + commit-graph: compute Bloom filters for changed paths
566
- + diff: halt tree-diff early after max_changes
567
- + bloom.c: core Bloom filter implementation for changed paths.
568
- + bloom.c: introduce core Bloom filter constructs
569
- + bloom.c: add the murmur3 hash implementation
570
- + commit-graph: define and use MAX_NUM_CHUNKS
571
- (this branch is used by ds/blame-on-bloom.)
572
-
573
- Introduce an extension to the commit-graph to make it efficient to
574
- check for the paths that were modified at each commit using Bloom
575
- filters.
576
-
577
- Will merge to 'master' together with ds/blame-on-bloom.
578
-
579
-
477
* jx/proc-receive-hook (2020-04-15) 8 commits
478
- SQUASH???
479
- doc: add documentation for the proc-receive hook
@@ -591,19 +488,6 @@ of the repositories listed at
488
outsource most of the ref updates to the new "proc-receive" hook.
489
490
594
-* jk/build-with-right-curl (2020-04-05) 3 commits
595
- (merged to 'next' on 2020-04-28 at 1718c25b44)
596
- + Makefile: avoid running curl-config unnecessarily
597
- + Makefile: use curl-config --cflags
598
- + Makefile: avoid running curl-config multiple times
599
-
600
- The build procedure did not use the libcurl library and its include
601
- files correctly for a custom-built installation.
602
-
603
- Will merge to 'master'.
604
- cf. <20200428033611.GB2369457@coredump.intra.peff.net>
605
-
606
-
491
* hn/reftable (2020-04-27) 12 commits
492
- t: use update-ref and show-ref to reading/writing refs
493
- Add some reftable testing infrastructure
@@ -627,22 +511,6 @@ of the repositories listed at
511
cf. https://github.com/git/git/runs/624424705?check_suite_focus=true
512
cf. <pull.539.v10.git.1588018418.gitgitgadget@gmail.com>
513
630
-
631
-* es/bugreport (2020-04-27) 6 commits
632
- (merged to 'next' on 2020-04-28 at fdfd36a5d7)
633
- + bugreport: drop extraneous includes
634
- (merged to 'next' on 2020-04-22 at f5a2ab988e)
635
- + bugreport: add compiler info
636
- + bugreport: add uname info
637
- + bugreport: gather git version and build info
638
- + bugreport: add tool to generate debugging info
639
- + help: move list_config_help to builtin/help
640
- (this branch is used by es/bugreport-with-hooks.)
641
-
642
- The "bugreport" tool.
643
-
644
- Will merge to 'master'.
645
-
514
--------------------------------------------------
515
[Discarded]
516