What's cooking (2020/10 #01)
Junio C Hamano committed
Oct 5, 2020 at 15:38 UTC
5f6c133ba56965805924ead3b8baa77d47197183
1 file changed
+369
-386
whats-cooking.txt
+369
-386
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2020, #08; Tue, 29)
4
-X-master-at: 306ee63a703ad67c54ba1209dc11dd9ea500dc1f
5
-X-next-at: fda3e449589e6e1698cd98ab4cab9214fe925eec
3
+Subject: What's cooking in git.git (Oct 2020, #01; Mon, 5)
4
+X-master-at: d98273ba77e1ab9ec755576bc86c716a97bf59d7
5
+X-next-at: c238dab514479c86f2794b853c4f3b6271c1e0d6
6
7
-What's cooking in git.git (Sep 2020, #08; Tue, 29)
7
+What's cooking in git.git (Oct 2020, #01; Mon, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -20,88 +20,29 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to 'master']
22
23
-* ah/pull (2020-09-24) 1 commit
24
- (merged to 'next' on 2020-09-25 at b5ddf0cf8b)
25
- + pull: don't warn if pull.ff has been set
26
-
27
- Earlier we taught "git pull" to warn when the user does not say the
28
- histories need to be merged, rebased or accepts only fast-
29
- forwarding, but the warning triggered for those who have set the
30
- pull.ff configuration variable.
31
-
32
-
33
-* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
34
- (merged to 'next' on 2020-09-22 at 62ea45c20e)
35
- + builtin/clone: avoid failure with GIT_DEFAULT_HASH
36
-
37
- "git clone" that clones from SHA-1 repository, while
38
- GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
39
- unusable repository that half-claims to be SHA-256 repository
40
- with SHA-1 objects and refs. This has been corrected.
41
-
42
-
43
-* bc/faq-misc (2020-09-20) 3 commits
44
- (merged to 'next' on 2020-09-22 at a81b728010)
45
- + docs: explain how to deal with files that are always modified
46
- + docs: explain why reverts are not always applied on merge
47
- + docs: explain why squash merges are broken with long-running branches
48
-
49
- More FAQ entries.
50
-
51
-
52
-* dl/zero-oid-in-hooks (2020-09-23) 3 commits
53
- (merged to 'next' on 2020-09-25 at 3c7d03d61a)
54
- + hooks--update.sample: use hash-agnostic zero OID
55
- + hooks--pre-push.sample: use hash-agnostic zero OID
56
- + hooks--pre-push.sample: modernize script
57
-
58
- Adjust sample hooks for hash algorithm other than SHA-1.
59
-
60
-
61
-* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled (2020-09-25) 1 commit
62
- (merged to 'next' on 2020-09-25 at e5233774ba)
63
- + t1506: rev-parse A..B and A...B
64
-
65
- Test update.
66
-
67
-
68
-* jk/make-protocol-v2-the-default (2020-09-25) 1 commit
69
- (merged to 'next' on 2020-09-25 at 21a5f9e880)
70
- + protocol: re-enable v2 protocol by default
71
-
72
- The transport protocol v2 has become the default again.
73
-
74
-
75
-* tb/bloom-improvements (2020-09-18) 13 commits
76
- (merged to 'next' on 2020-09-22 at 520d531ad8)
77
- + commit-graph: introduce 'commitGraph.maxNewFilters'
78
- + builtin/commit-graph.c: introduce '--max-new-filters=<n>'
79
- + commit-graph: rename 'split_commit_graph_opts'
80
- + bloom: encode out-of-bounds filters as non-empty
81
- + bloom/diff: properly short-circuit on max_changes
82
- + bloom: use provided 'struct bloom_filter_settings'
83
- + bloom: split 'get_bloom_filter()' in two
84
- + commit-graph.c: store maximum changed paths
85
- + commit-graph: respect 'commitGraph.readChangedPaths'
86
- + t/helper/test-read-graph.c: prepare repo settings
87
- + commit-graph: pass a 'struct repository *' in more places
88
- + t4216: use an '&&'-chain
89
- + commit-graph: introduce 'get_bloom_filter_settings()'
90
-
91
- "git commit-graph write" learned to limit the number of bloom
92
- filters that are computed from scratch with the --max-new-filters
93
- option.
94
-
95
-
96
-* tg/range-diff-same-file-fix (2020-09-24) 1 commit
97
- (merged to 'next' on 2020-09-25 at c2078e5505)
98
- + diff: fix modified lines stats with --stat and --numstat
23
+* ab/mediawiki-fixes (2020-09-21) 18 commits
24
+ (merged to 'next' on 2020-09-25 at 878693716e)
25
+ + remote-mediawiki: use "sh" to eliminate unquoted commands
26
+ + remote-mediawiki: annotate unquoted uses of run_git()
27
+ + remote-mediawiki: convert to quoted run_git() invocation
28
+ + remote-mediawiki: provide a list form of run_git()
29
+ + remote-mediawiki tests: annotate failing tests
30
+ + remote-mediawiki: fix duplicate revisions being imported
31
+ + remote-mediawiki tests: use CLI installer
32
+ + remote-mediawiki tests: use inline PerlIO for readability
33
+ + remote-mediawiki tests: replace deprecated Perl construct
34
+ + remote-mediawiki tests: use a more idiomatic dispatch table
35
+ + remote-mediawiki tests: use "$dir/" instead of "$dir."
36
+ + remote-mediawiki tests: change `[]` to `test`
37
+ + remote-mediawiki tests: use test_cmp in tests
38
+ + remote-mediawiki tests: use a 10 character password
39
+ + remote-mediawiki tests: use the login/password variables
40
+ + remote-mediawiki doc: don't hardcode Debian PHP versions
41
+ + remote-mediawiki doc: link to MediaWiki's current version
42
+ + remote-mediawiki doc: correct link to GitHub project
43
100
- "git range-diff" showed incorrect diffstat, which has been
101
- corrected.
44
+ Modernization and fixes to MediaWiki remote backend.
45
103
---------------------------------------------------
104
-[New Topics]
46
47
* al/ref-filter-merged-and-no-merged (2020-09-26) 1 commit
48
(merged to 'next' on 2020-09-29 at 748a286753)
@@ -109,8 +50,6 @@ repositories listed at
50
51
Hotfix.
52
112
- Will merge to 'master'.
113
-
53
54
* au/complete-restore-s (2020-09-26) 2 commits
55
(merged to 'next' on 2020-09-29 at 7bbf508562)
@@ -120,7 +59,23 @@ repositories listed at
59
The command line completion (in contrib/) learned that "git restore
60
-s <TAB>" is often followed by a refname.
61
123
- Will merge to 'master'.
62
+
63
+* cc/bisect-start-fix (2020-09-25) 1 commit
64
+ (merged to 'next' on 2020-09-29 at 637011d04a)
65
+ + bisect: don't use invalid oid as rev when starting
66
+
67
+ "git bisect start X Y", when X and Y are not valid committish
68
+ object names, should take X and Y as pathspec, but didn't.
69
+
70
+
71
+* ds/in-merge-bases-many-optim-bug (2020-10-02) 1 commit
72
+ (merged to 'next' on 2020-10-04 at b736873ada)
73
+ + commit-reach: fix in_merge_bases_many bug
74
+ (this branch is used by sk/force-if-includes.)
75
+
76
+ in_merge_bases_many(), a way to see if a commit is reachable from
77
+ any commit in a set of commits, was totally broken when the
78
+ commit-graph feature was in use, which has been corrected.
79
80
81
* eg/mailinfo-doc-scissors (2020-09-28) 1 commit
@@ -129,7 +84,16 @@ repositories listed at
84
85
The explanation of the "scissors line" has been clarified.
86
132
- Will merge to 'master'.
87
+
88
+* jc/blame-ignore-fix (2020-09-24) 2 commits
89
+ (merged to 'next' on 2020-09-29 at 96fbdb57fb)
90
+ + blame: validate and peel the object names on the ignore list
91
+ + t8013: minimum preparatory clean-up
92
+
93
+ "git blame --ignore-rev/--ignore-revs-file" failed to validate
94
+ their input are valid revision, and failed to take into account
95
+ that the user may want to give an annotated tag instead of a
96
+ commit, which has been corrected.
97
98
99
* jc/fmt-merge-msg-suppress-destination (2020-09-27) 1 commit
@@ -138,205 +102,254 @@ repositories listed at
102
103
Docfix.
104
141
- Will merge to 'master'.
105
106
+* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
107
+ (merged to 'next' on 2020-09-29 at 9af3360572)
108
+ + sequencer: stop abbreviating stopped-sha file
109
144
-* jk/format-auto-base-when-able (2020-09-26) 1 commit
145
- - format-patch: teach format.useAutoBase "whenAble" option
110
+ Code simplification.
111
147
- "git format-patch" learns to take "if-able" as a possible value for
148
- its "--base" option, and "whenAble" as a possible value for the
149
- format.useAutoBase configuration variable to become no-op when the
150
- automatically computed base does not make sense.
112
113
+* jk/diff-cc-oidfind-fix (2020-09-30) 1 commit
114
+ (merged to 'next' on 2020-10-04 at 637072574f)
115
+ + combine-diff: handle --find-object in multitree code path
116
153
-* ma/worktree-cleanups (2020-09-27) 7 commits
154
- - worktree: use skip_prefix to parse target
155
- - worktree: rename copy-pasted variable
156
- - worktree: update renamed variable in comment
157
- - worktree: inline `worktree_ref()` into its only caller
158
- - wt-status: introduce wt_status_state_free_buffers()
159
- - wt-status: print to s->fp, not stdout
160
- - wt-status: replace sha1 mentions with oid
117
+ "log -c --find-object=X" did not work well to find a merge that
118
+ involves a change to an object X from only one parent.
119
162
- Code clean-up.
120
164
- Will merge to 'next'.
121
+* jk/drop-unaligned-loads (2020-09-24) 2 commits
122
+ (merged to 'next' on 2020-09-29 at 29c05387a0)
123
+ + Revert "fast-export: use local array to store anonymized oid"
124
+ + bswap.h: drop unaligned loads
125
126
+ Compilation fix around type punning.
127
167
-* mt/delta-base-cache-races (2020-09-28) 2 commits
168
- (merged to 'next' on 2020-09-29 at ee2d60c077)
169
- + packfile: fix memory leak in add_delta_base_cache()
170
- + packfile: fix race condition on unpack_entry()
128
172
- A race that leads to an access to a free'd data was corrected in
173
- the codepath that reads pack files.
129
+* jk/format-auto-base-when-able (2020-10-01) 1 commit
130
+ (merged to 'next' on 2020-10-04 at ab8f65b8c5)
131
+ + format-patch: teach format.useAutoBase "whenAble" option
132
175
- Will merge to 'master'.
133
+ "git format-patch" learns to take "whenAble" as a possible value
134
+ for the format.useAutoBase configuration variable to become no-op
135
+ when the automatically computed base does not make sense.
136
137
178
-* nl/credential-crlf (2020-09-28) 3 commits
179
- - docs: make notes regarding credential line reading
180
- - credentials: make line reading Windows compatible
181
- - credential.c: fix credential reading with regards to CR/LF
138
+* jk/refspecs-negative (2020-09-30) 1 commit
139
+ (merged to 'next' on 2020-10-04 at 2948e90fab)
140
+ + refspec: add support for negative refspecs
141
183
- cf. <pull.710.v2.git.git.1601293224.gitgitgadget@gmail.com>
142
+ "git fetch" and "git push" support negative refspecs.
143
144
186
-* tb/upload-pack-filters (2020-09-27) 1 commit
187
- (merged to 'next' on 2020-09-29 at 3dde767170)
188
- + config/uploadpack.txt: fix typo in `--filter=tree:<n>`
145
+* jk/shortlog-group-by-trailer (2020-09-27) 8 commits
146
+ (merged to 'next' on 2020-09-29 at 3706b06db5)
147
+ + shortlog: allow multiple groups to be specified
148
+ + shortlog: parse trailer idents
149
+ + shortlog: rename parse_stdin_ident()
150
+ + shortlog: de-duplicate trailer values
151
+ + shortlog: match commit trailers with --group
152
+ + trailer: add interface for iterating over commit trailers
153
+ + shortlog: add grouping option
154
+ + shortlog: change "author" variables to "ident"
155
190
- Hotfix.
156
+ "git shortlog" has been taught to group commits by the contents of
157
+ the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
158
192
- Will merge to 'master'.
159
160
+* jk/unused (2020-09-30) 10 commits
161
+ (merged to 'next' on 2020-10-01 at 440a7a0a7a)
162
+ + dir.c: drop unused "untracked" from treat_path_fast()
163
+ + sequencer: handle ignore_footer when parsing trailers
164
+ + test-advise: check argument count with argc instead of argv
165
+ + sparse-checkout: fill in some options boilerplate
166
+ + sequencer: drop repository argument from run_git_commit()
167
+ + push: drop unused repo argument to do_push()
168
+ + assert PARSE_OPT_NONEG in parse-options callbacks
169
+ + env--helper: write to opt->value in parseopt helper
170
+ + drop unused argc parameters
171
+ + convert: drop unused crlf_action from check_global_conv_flags_eol()
172
+
173
+ Code cleanup.
174
+
175
+
176
+* js/cmake-vs (2020-09-30) 10 commits
177
+ (merged to 'next' on 2020-10-01 at 40be8c6094)
178
+ + hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
179
+ + cmake (Windows): recommend using Visual Studio's built-in CMake support
180
+ + cmake (Windows): initialize vcpkg/build dependencies automatically
181
+ + cmake (Windows): complain when encountering an unknown compiler
182
+ + cmake (Windows): let the `.dll` files be found when running the tests
183
+ + cmake: quote the path accurately when editing `test-lib.sh`
184
+ + cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
185
+ + cmake: ensure that the `vcpkg` packages are found on Windows
186
+ + cmake: do find Git for Windows' shell interpreter
187
+ + cmake: ignore files generated by CMake as run in Visual Studio
188
195
-* so/combine-diff-simplify (2020-09-29) 1 commit
196
- - diff: get rid of redundant 'dense' argument
189
+ Using the CMake support we added some time ago for real with Visual
190
+ Studio build revealed there were lot of usability improvements
191
+ possible, which have been carried out.
192
198
---------------------------------------------------
199
-[Stalled]
193
201
-* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
202
- - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
194
+* js/default-branch-name-part-2 (2020-09-26) 5 commits
195
+ (merged to 'next' on 2020-09-30 at 3fb4047ce3)
196
+ + t9902: avoid using the branch name `master`
197
+ + tests: avoid variations of the `master` branch name
198
+ + t3200: avoid variations of the `master` branch name
199
+ + fast-export: avoid using unnecessary language in a code comment
200
+ + t/test-terminal: avoid non-inclusive language
201
204
- Doc update.
202
+ Update the tests to drop word 'master' from them.
203
206
- Expecting a reroll.
207
- cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
208
- cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
204
205
+* js/no-builtins-on-disk-option (2020-09-21) 3 commits
206
+ (merged to 'next' on 2020-09-25 at 6b976da4d2)
207
+ + ci: stop linking built-ins to the dashed versions
208
+ + Optionally skip linking/copying the built-ins
209
+ + msvc: copy the correct `.pdb` files in the Makefile target `install`
210
211
-* jc/war-on-dashed-git (2020-08-27) 1 commit
212
- - git: catch an attempt to run "git-foo"
211
+ The installation procedure learned to optionally omit "git-foo"
212
+ executable files for each 'foo' built-in subcommand, which are only
213
+ required by old timers that still rely on the age old promise that
214
+ prepending "git --exec-path" output to PATH early in their script
215
+ will keep the "git-foo" calls they wrote working.
216
214
- The first step to remove on-disk binaries for built-in subcommands
215
- by soliciting objections.
217
+ The old attempt to remove these executables from the disk failed in
218
+ the 1.6 era; it may be worth attempting again, but I think it is
219
+ worth to keep this topic separate from such a policy change to help
220
+ it graduate early.
221
217
- On hold for now.
222
223
+* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-28) 2 commits
224
+ (merged to 'next' on 2020-10-01 at 77c4c6094c)
225
+ + fetch: do not override partial clone filter
226
+ + promisor-remote: remove unused variable
227
220
-* dr/push-remoteref-fix (2020-04-23) 1 commit
221
- - remote.c: fix handling of %(push:remoteref)
228
+ The lazy fetching done internally to make missing objects available
229
+ in a partial clone incorrectly made permanent damage to the partial
230
+ clone filter in the repository, which has been corrected.
231
223
- The "%(push:remoteref)" placeholder in the "--format=" argument of
224
- "git format-patch" (and friends) only showed what got explicitly
225
- configured, not what ref at the receiving end would be updated when
226
- "git push" was used, as it ignored the default behaviour (e.g. update
227
- the same ref as the source).
232
229
- Discard for now.
230
- cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
231
- cf. <20200911214358.acl3hy2e763begoo@feanor>
233
+* ma/worktree-cleanups (2020-09-27) 7 commits
234
+ (merged to 'next' on 2020-10-01 at 369dcfb161)
235
+ + worktree: use skip_prefix to parse target
236
+ + worktree: rename copy-pasted variable
237
+ + worktree: update renamed variable in comment
238
+ + worktree: inline `worktree_ref()` into its only caller
239
+ + wt-status: introduce wt_status_state_free_buffers()
240
+ + wt-status: print to s->fp, not stdout
241
+ + wt-status: replace sha1 mentions with oid
242
243
+ Code clean-up.
244
234
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
235
- - zlib.c: use size_t for size
245
237
- The wrapper to call into zlib followed our long tradition to use
238
- "unsigned long" for sizes of regions in memory, which have been
239
- updated to use "size_t".
246
+* mr/bisect-in-c-2 (2020-09-24) 6 commits
247
+ (merged to 'next' on 2020-09-29 at a15f1729d2)
248
+ + bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
249
+ + bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
250
+ + bisect--helper: reimplement `bisect_autostart` shell function in C
251
+ + bisect--helper: introduce new `write_in_file()` function
252
+ + bisect--helper: use '-res' in 'cmd_bisect__helper' return
253
+ + bisect--helper: BUG() in cmd_*() on invalid subcommand
254
241
---------------------------------------------------
242
-[Cooking]
255
+ Rewrite of the "git bisect" script in C continues.
256
244
-* cc/bisect-start-fix (2020-09-25) 1 commit
245
- (merged to 'next' on 2020-09-29 at 637011d04a)
246
- + bisect: don't use invalid oid as rev when starting
257
248
- "git bisect start X Y", when X and Y are not valid committish
249
- object names, should take X and Y as pathspec, but didn't.
258
+* mt/delta-base-cache-races (2020-09-28) 2 commits
259
+ (merged to 'next' on 2020-09-29 at ee2d60c077)
260
+ + packfile: fix memory leak in add_delta_base_cache()
261
+ + packfile: fix race condition on unpack_entry()
262
251
- Will merge to 'master'.
263
+ A race that leads to an access to a free'd data was corrected in
264
+ the codepath that reads pack files.
265
266
254
-* mt/parallel-checkout-part-1 (2020-09-22) 19 commits
255
- - ci: run test round with parallel-checkout enabled
256
- - parallel-checkout: add tests related to .gitattributes
257
- - parallel-checkout: add tests related to clone collisions
258
- - parallel-checkout: add tests for basic operations
259
- - checkout-index: add parallel checkout support
260
- - builtin/checkout.c: complete parallel checkout support
261
- - make_transient_cache_entry(): optionally alloc from mem_pool
262
- - parallel-checkout: support progress displaying
263
- - parallel-checkout: make it truly parallel
264
- - unpack-trees: add basic support for parallel checkout
265
- - entry: add checkout_entry_ca() which takes preloaded conv_attrs
266
- - entry: move conv_attrs lookup up to checkout_entry()
267
- - entry: extract cache_entry update from write_entry()
268
- - entry: make fstat_output() and read_blob_entry() public
269
- - entry: extract a header file for entry.c functions
270
- - convert: add conv_attrs classification
271
- - convert: add get_stream_filter_ca() variant
272
- - convert: add [async_]convert_to_working_tree_ca() variants
273
- - convert: make convert_attrs() and convert structs public
267
+* nl/credential-crlf (2020-10-03) 1 commit
268
+ (merged to 'next' on 2020-10-04 at 213256c1e6)
269
+ + credential: treat CR/LF as line endings in the credential protocol
270
275
- Parallel checkout.
271
+ Loosen the parser in the receiving end of the credential protocol
272
+ to allow credential helper to terminate lines with CRLF line
273
+ ending, as well as LF line ending.
274
275
278
-* jk/drop-unaligned-loads (2020-09-24) 2 commits
279
- (merged to 'next' on 2020-09-29 at 29c05387a0)
280
- + Revert "fast-export: use local array to store anonymized oid"
281
- + bswap.h: drop unaligned loads
276
+* pb/submodule-doc-fix (2020-10-04) 1 commit
277
+ (merged to 'next' on 2020-10-04 at c535486479)
278
+ + gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'
279
283
- Compilation fix around type punning.
280
+ Doc update.
281
285
- Will merge to 'master'.
282
283
+* pm/gitk-update (2020-10-03) 11 commits
284
+ (merged to 'next' on 2020-10-04 at fd505ccfc1)
285
+ + Merge remote-tracking branch 'paulus/master' into pm/gitk-update
286
+ + gitk: Resize panes correctly when reducing window size
287
+ + gitk: replace tabs with spaces
288
+ + gitk: fix the context menu not appearing in the presence of submodule diffs
289
+ + gitk: Un-hide selection in areas with non-default background color
290
+ + gitk: add diff lines background colors
291
+ + gitk: be prepared to be run in a bare repository
292
+ + gitk: Preserve window dimensions on exit when not using ttk themes
293
+ + gitk: don't highlight files after submodules as submodules
294
+ + gitk: fix branch name encoding error
295
+ + gitk: rename "commit summary" to "commit reference"
296
288
-* jc/blame-ignore-fix (2020-09-24) 2 commits
289
- (merged to 'next' on 2020-09-29 at 96fbdb57fb)
290
- + blame: validate and peel the object names on the ignore list
291
- + t8013: minimum preparatory clean-up
297
+ "gitk" update.
298
293
- "git blame --ignore-rev/--ignore-revs-file" failed to validate
294
- their input are valid revision, and failed to take into account
295
- that the user may want to give an annotated tag instead of a
296
- commit, which has been corrected.
299
298
- Will merge to 'master'.
300
+* rs/archive-add-file (2020-09-19) 3 commits
301
+ (merged to 'next' on 2020-10-04 at fffc088553)
302
+ + Makefile: use git-archive --add-file
303
+ + archive: add --add-file
304
+ + archive: read short blobs in archive.c::write_archive_entry()
305
306
+ "git archive" learns the "--add-file" option to include untracked
307
+ files into a snapshot from a tree-ish.
308
301
-* jk/shortlog-group-by-trailer (2020-09-27) 8 commits
302
- (merged to 'next' on 2020-09-29 at 3706b06db5)
303
- + shortlog: allow multiple groups to be specified
304
- + shortlog: parse trailer idents
305
- + shortlog: rename parse_stdin_ident()
306
- + shortlog: de-duplicate trailer values
307
- + shortlog: match commit trailers with --group
308
- + trailer: add interface for iterating over commit trailers
309
- + shortlog: add grouping option
310
- + shortlog: change "author" variables to "ident"
309
312
- "git shortlog" has been taught to group commits by the contents of
313
- the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
310
+* sn/fast-import-doc (2020-10-04) 1 commit
311
+ (merged to 'next' on 2020-10-04 at fdf196b997)
312
+ + fast-import: fix typo in documentation
313
+
314
+ Doc update.
315
315
- Will merge to 'master'.
316
317
+* so/combine-diff-simplify (2020-09-29) 1 commit
318
+ (merged to 'next' on 2020-09-30 at d45e33ebb0)
319
+ + diff: get rid of redundant 'dense' argument
320
318
-* js/cmake-vs (2020-09-28) 11 commits
319
- - cmake: fix typo in message when `msgfmt` was not found
320
- - hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
321
- - cmake (Windows): recommend using Visual Studio's built-in CMake support
322
- - cmake (Windows): initialize vcpkg/build dependencies automatically
323
- - cmake (Windows): complain when encountering an unknown compiler
324
- - cmake (Windows): let the `.dll` files be found when running the tests
325
- - cmake: quote the path accurately when editing `test-lib.sh`
326
- - cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
327
- - cmake: ensure that the `vcpkg` packages are found on Windows
328
- - cmake: do find Git for Windows' shell interpreter
329
- - cmake: ignore files generated by CMake as run in Visual Studio
321
+ Code simplification.
322
331
- Using the CMake support we added some time ago for real with Visual
332
- Studio build revealed there were lot of usability improvements
333
- possible, which have been carried out.
323
335
- Expecting a (hopefully) final reroll.
336
- cf. <nycvar.QRO.7.76.6.2009291406310.50@tvgsbejvaqbjf.bet>
337
- cf. <nycvar.QRO.7.76.6.2009291407130.50@tvgsbejvaqbjf.bet>
324
+* tb/upload-pack-filters (2020-09-27) 1 commit
325
+ (merged to 'next' on 2020-09-29 at 3dde767170)
326
+ + config/uploadpack.txt: fix typo in `--filter=tree:<n>`
327
+
328
+ Hotfix.
329
330
331
+* td/submodule-update-quiet (2020-10-01) 1 commit
332
+ (merged to 'next' on 2020-10-01 at 4ae8bee636)
333
+ + submodule update: silence underlying merge/rebase with "--quiet"
334
+
335
+ "git submodule update --quiet" did not squelch underlying "rebase"
336
+ and "pull" commands.
337
+
338
+--------------------------------------------------
339
+[New Topics]
340
+
341
+* mk/diff-ignore-regex (2020-10-01) 2 commits
342
+ - t: add -I<regex> tests
343
+ - diff: add -I<regex> that ignores matching changes
344
+
345
+ "git diff" family of commands learned the "-I<regex>" option to
346
+ ignore hunks whose changed lines all match the given pattern.
347
+
348
+ Expecting review response.
349
+
350
+--------------------------------------------------
351
+[Stalled]
352
+
353
* sv/t7001-modernize (2020-09-25) 11 commits
354
- t7001: move cleanup code from outside the tests into them
355
- t7001: use `test` rather than `[`
@@ -356,41 +369,103 @@ repositories listed at
369
cf. <20200925170256.11490-1-shubhunic@gmail.com>
370
371
359
-* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
360
- (merged to 'next' on 2020-09-29 at 9af3360572)
361
- + sequencer: stop abbreviating stopped-sha file
372
+* ew/decline-core-abbrev (2020-09-01) 1 commit
373
+ - core.abbrev <off|false|no> disables abbreviations
374
363
- Code simplification.
375
+ Allow the configuration to specify no abbreviation regardless of
376
+ the hash algorithm.
377
365
- Will merge to 'master'.
378
+ Expecting a reroll. The intent is very good.
379
380
368
-* rs/archive-add-file (2020-09-19) 3 commits
369
- - Makefile: use git-archive --add-file
370
- - archive: add --add-file
371
- - archive: read short blobs in archive.c::write_archive_entry()
381
+* bc/rev-parse-path-format (2020-09-08) 1 commit
382
+ - rev-parse: add option for absolute or relative path formatting
383
373
- "git archive" learns the "--add-file" option to include untracked
374
- files into a snapshot from a tree-ish.
384
+ "git rev-parse" can be explicitly told to give output as absolute
385
+ or relative path.
386
387
+ Expecting a reroll.
388
+ cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
389
377
-* js/default-branch-name-part-2 (2020-09-26) 5 commits
378
- - t9902: avoid using the branch name `master`
379
- - tests: avoid variations of the `master` branch name
380
- - t3200: avoid variations of the `master` branch name
381
- - fast-export: avoid using unnecessary language in a code comment
382
- - t/test-terminal: avoid non-inclusive language
390
384
- Update the tests to drop word 'master' from them
391
+* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
392
+ - config: option transfer.ipversion to set transport protocol version for network fetches
393
394
+ Adds transfer.ipversion configuration variable.
395
387
-* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-28) 2 commits
388
- - fetch: do not override partial clone filter
389
- - promisor-remote: remove unused variable
396
+ Needs more work.
397
391
- The lazy fetching done internally to make missing objects available
392
- in a partial clone incorrectly made permanent damate to the partial
393
- clone filter in the repository, which has been corrected.
398
+
399
+* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
400
+ - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
401
+
402
+ Doc update.
403
+
404
+ Expecting a reroll.
405
+ cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
406
+ cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
407
+
408
+
409
+* jc/war-on-dashed-git (2020-08-27) 1 commit
410
+ - git: catch an attempt to run "git-foo"
411
+
412
+ The first step to remove on-disk binaries for built-in subcommands
413
+ by soliciting objections.
414
+
415
+ On hold for now.
416
+
417
+
418
+* dr/push-remoteref-fix (2020-04-23) 1 commit
419
+ - remote.c: fix handling of %(push:remoteref)
420
+
421
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
422
+ "git format-patch" (and friends) only showed what got explicitly
423
+ configured, not what ref at the receiving end would be updated when
424
+ "git push" was used, as it ignored the default behaviour (e.g. update
425
+ the same ref as the source).
426
+
427
+ Discard for now.
428
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
429
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
430
+
431
+
432
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
433
+ - zlib.c: use size_t for size
434
+
435
+ The wrapper to call into zlib followed our long tradition to use
436
+ "unsigned long" for sizes of regions in memory, which have been
437
+ updated to use "size_t".
438
+
439
+--------------------------------------------------
440
+[Cooking]
441
+
442
+* mt/parallel-checkout-part-1 (2020-10-05) 20 commits
443
+ (merged to 'next' on 2020-10-05 at 571e16d68a)
444
+ + parallel-checkout: drop unused checkout state parameter
445
+ (merged to 'next' on 2020-10-04 at 20438c1143)
446
+ + ci: run test round with parallel-checkout enabled
447
+ + parallel-checkout: add tests related to .gitattributes
448
+ + parallel-checkout: add tests related to clone collisions
449
+ + parallel-checkout: add tests for basic operations
450
+ + checkout-index: add parallel checkout support
451
+ + builtin/checkout.c: complete parallel checkout support
452
+ + make_transient_cache_entry(): optionally alloc from mem_pool
453
+ + parallel-checkout: support progress displaying
454
+ + parallel-checkout: make it truly parallel
455
+ + unpack-trees: add basic support for parallel checkout
456
+ + entry: add checkout_entry_ca() which takes preloaded conv_attrs
457
+ + entry: move conv_attrs lookup up to checkout_entry()
458
+ + entry: extract cache_entry update from write_entry()
459
+ + entry: make fstat_output() and read_blob_entry() public
460
+ + entry: extract a header file for entry.c functions
461
+ + convert: add conv_attrs classification
462
+ + convert: add get_stream_filter_ca() variant
463
+ + convert: add [async_]convert_to_working_tree_ca() variants
464
+ + convert: make convert_attrs() and convert structs public
465
+
466
+ Parallel checkout.
467
+
468
+ Will cook in 'next'.
469
470
471
* dl/diff-merge-base (2020-09-21) 10 commits
@@ -412,7 +487,7 @@ repositories listed at
487
cf. <xmqqblhyepup.fsf@gitster.c.googlers.com>
488
489
415
-* sb/clone-origin (2020-09-29) 7 commits
490
+* sb/clone-origin (2020-09-30) 7 commits
491
- clone: allow configurable default for `-o`/`--origin`
492
- clone: read new remote name from remote_name instead of option_origin
493
- clone: validate --origin option before use
@@ -425,14 +500,15 @@ repositories listed at
500
to customize what nickname to use to call the remote the repository
501
was cloned from.
502
428
- Expecting an update.
503
+ Will merge to 'next'.
504
505
431
-* sk/force-if-includes (2020-09-27) 4 commits
432
- - SQUASH??? name an array in singular and avoid commenting obvious
433
- - t, doc: update tests, reference for "--force-if-includes"
434
- - push: parse and set flag for "--force-if-includes"
435
- - push: add reflog check for "--force-if-includes"
506
+* sk/force-if-includes (2020-10-03) 4 commits
507
+ (merged to 'next' on 2020-10-04 at 09c4c1e088)
508
+ + t, doc: update tests, reference for "--force-if-includes"
509
+ + push: parse and set flag for "--force-if-includes"
510
+ + push: add reflog check for "--force-if-includes"
511
+ + Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
512
513
"git push --force-with-lease[=<ref>]" can easily be misused to lose
514
commits unless the user takes good care of their own "git fetch".
@@ -440,74 +516,35 @@ repositories listed at
516
being force-pushed was created after examining the commit at the
517
tip of the remote ref that is about to be force-replaced.
518
443
- On hold.
444
- Seems to trigger gotchas in the reachability logic in commit-graph.
445
-
446
-
447
-* ab/mediawiki-fixes (2020-09-21) 18 commits
448
- (merged to 'next' on 2020-09-25 at 878693716e)
449
- + remote-mediawiki: use "sh" to eliminate unquoted commands
450
- + remote-mediawiki: annotate unquoted uses of run_git()
451
- + remote-mediawiki: convert to quoted run_git() invocation
452
- + remote-mediawiki: provide a list form of run_git()
453
- + remote-mediawiki tests: annotate failing tests
454
- + remote-mediawiki: fix duplicate revisions being imported
455
- + remote-mediawiki tests: use CLI installer
456
- + remote-mediawiki tests: use inline PerlIO for readability
457
- + remote-mediawiki tests: replace deprecated Perl construct
458
- + remote-mediawiki tests: use a more idiomatic dispatch table
459
- + remote-mediawiki tests: use "$dir/" instead of "$dir."
460
- + remote-mediawiki tests: change `[]` to `test`
461
- + remote-mediawiki tests: use test_cmp in tests
462
- + remote-mediawiki tests: use a 10 character password
463
- + remote-mediawiki tests: use the login/password variables
464
- + remote-mediawiki doc: don't hardcode Debian PHP versions
465
- + remote-mediawiki doc: link to MediaWiki's current version
466
- + remote-mediawiki doc: correct link to GitHub project
467
-
468
- Modernization and fixes to MediaWiki remote backend.
469
-
519
Will merge to 'master'.
520
521
473
-* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
474
- - config: option transfer.ipversion to set transport protocol version for network fetches
475
-
476
- Adds transfer.ipversion configuration variable.
477
-
478
- Needs more work.
479
-
522
+* hn/reftable (2020-10-01) 13 commits
523
+ . reftable: "test-tool dump-reftable" command.
524
+ . reftable: rest of library
525
+ . reftable: file level tests
526
+ . reftable: read reftable files
527
+ . reftable: write reftable files
528
+ . reftable: a generic binary tree implementation
529
+ . reftable: reading/writing blocks
530
+ . reftable: (de)serialization for the polymorphic record type.
531
+ . reftable: utility functions
532
+ . reftable: add a barebones unittest framework
533
+ . vcxproj: adjust for the reftable changes
534
+ . reftable: define the public API
535
+ . reftable: add LICENSE
536
481
-* hn/reftable (2020-09-22) 14 commits
482
- - reftable: fix some sparse warnings
483
- - reftable: "test-tool dump-reftable" command.
484
- - reftable: rest of library
485
- - reftable: file level tests
486
- - reftable: read reftable files
487
- - reftable: write reftable files
488
- - reftable: a generic binary tree implementation
489
- - reftable: reading/writing blocks
490
- - reftable: (de)serialization for the polymorphic record type.
491
- - reftable: utility functions
492
- - reftable: add a barebones unittest framework
493
- - vcxproj: adjust for the reftable changes
494
- - reftable: define the public API
495
- - reftable: add LICENSE
496
-
497
-
498
-* bc/rev-parse-path-format (2020-09-08) 1 commit
499
- - rev-parse: add option for absolute or relative path formatting
500
-
501
- "git rev-parse" can be explicitly told to give output as absolute
502
- or relative path.
537
+ The reftable backend for the refs API.
538
539
Expecting a reroll.
505
- cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
540
+ Seems not to build for Windows folks.
541
+ cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
542
+ cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
543
544
508
-* ds/maintenance-part-3 (2020-09-25) 7 commits
545
+* ds/maintenance-part-3 (2020-10-05) 7 commits
546
- maintenance: add troubleshooting guide to docs
510
- - maintenance: recommended schedule in register/start
547
+ - maintenance: use default schedule if not configured
548
- maintenance: add start/stop subcommands
549
- maintenance: add [un]register subcommands
550
- for-each-repo: run subcommands on configured repos
@@ -518,6 +555,8 @@ repositories listed at
555
Parts of "git maintenance" to ease writing crontab entries (and
556
other scheduling system configuration) for it.
557
558
+ cf. <20201005195701.14268-1-martin.agren@gmail.com>
559
+
560
561
* es/config-hooks (2020-09-09) 9 commits
562
- run_commit_hook: take strvec instead of varargs
@@ -532,6 +571,9 @@ repositories listed at
571
572
The "hooks defined in config" topic.
573
574
+ Expecting a reroll.
575
+ cf. <20201005212751.GH331156@google.com>
576
+
577
578
* mt/grep-sparse-checkout (2020-09-10) 9 commits
579
- config: add setting to ignore sparsity patterns in some cmds
@@ -548,78 +590,19 @@ repositories listed at
590
paths.
591
592
551
-* ew/decline-core-abbrev (2020-09-01) 1 commit
552
- - core.abbrev <off|false|no> disables abbreviations
553
-
554
- Allow the configuration to specify no abbreviation regardless of
555
- the hash algorithm.
556
-
557
- Expecting a reroll. The intent is very good.
558
-
559
-
560
-* mr/bisect-in-c-2 (2020-09-24) 6 commits
561
- (merged to 'next' on 2020-09-29 at a15f1729d2)
562
- + bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
563
- + bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
564
- + bisect--helper: reimplement `bisect_autostart` shell function in C
565
- + bisect--helper: introduce new `write_in_file()` function
566
- + bisect--helper: use '-res' in 'cmd_bisect__helper' return
567
- + bisect--helper: BUG() in cmd_*() on invalid subcommand
568
-
569
- Rewrite of the "git bisect" script in C continues.
570
-
571
- Will merge to 'master'.
572
-
573
-
574
-* js/no-builtins-on-disk-option (2020-09-21) 3 commits
575
- (merged to 'next' on 2020-09-25 at 6b976da4d2)
576
- + ci: stop linking built-ins to the dashed versions
577
- + Optionally skip linking/copying the built-ins
578
- + msvc: copy the correct `.pdb` files in the Makefile target `install`
579
-
580
- The installation procedure learned to optionally omit "git-foo"
581
- executable files for each 'foo' built-in subcommand, which are only
582
- required by old timers that still rely on the age old promise that
583
- prepending "git --exec-path" output to PATH early in their script
584
- will keep the "git-foo" calls they wrote working.
585
-
586
- The old attempt to remove these executables from the disk failed in
587
- the 1.6 era; it may be worth attempting again, but I think it is
588
- worth to keep this topic separate from such a policy change to help
589
- it graduate early.
590
-
591
- Will merge to 'master'.
592
-
593
-
594
-* jk/refspecs-negative (2020-09-25) 1 commit
595
- - refspec: add support for negative refspecs
596
-
597
- "git fetch" and "git push" support negative refspecs.
598
-
599
-
593
* ds/maintenance-part-2 (2020-09-25) 8 commits
601
- - maintenance: add incremental-repack auto condition
602
- - maintenance: auto-size incremental-repack batch
603
- - maintenance: add incremental-repack task
604
- - midx: use start_delayed_progress()
605
- - midx: enable core.multiPackIndex by default
606
- - maintenance: create auto condition for loose-objects
607
- - maintenance: add loose-objects task
608
- - maintenance: add prefetch task
594
+ (merged to 'next' on 2020-10-04 at c2a46f390c)
595
+ + maintenance: add incremental-repack auto condition
596
+ + maintenance: auto-size incremental-repack batch
597
+ + maintenance: add incremental-repack task
598
+ + midx: use start_delayed_progress()
599
+ + midx: enable core.multiPackIndex by default
600
+ + maintenance: create auto condition for loose-objects
601
+ + maintenance: add loose-objects task
602
+ + maintenance: add prefetch task
603
(this branch is used by ds/maintenance-part-3.)
604
605
"git maintenance", an extended big brother of "git gc", continues
606
to evolve.
607
614
---------------------------------------------------
615
-[Discarded]
616
-
617
-* js/ignore-cmake-build-artifacts (2020-09-23) 1 commit
618
- . cmake: ignore generated files
619
-
620
- Running CMake based build with VS (in contrib/) from the top-level
621
- of the working tree leaves extra build crufts behind. Add patterns
622
- to .gitignore
623
-
624
- Retracted.
625
- cf. <pull.738.git.1601044118.gitgitgadget@gmail.com>
608
+ Will cook in 'next'.