@matheusbsbs / matheus-bagliano / commits / 3fa9929407

What's cooking (2020/06 #03)

Junio C Hamano committed Jun 17, 2020 at 23:15 UTC 3fa9929407a2d76a05c2ccdbeeb0b862d8ff1c14
1 file changed +264 -265
whats-cooking.txt
+264 -265
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Jun 2020, #02; Wed, 10)
4 -X-master-at: 0313f36c6ebecb3bffe6f15cf25a4883100f0214
5 -X-next-at: abb59f83a216876869f6c88d32485dc740ada78d
3 +Subject: What's cooking in git.git (Jun 2020, #03; Wed, 17)
4 +X-master-at: 101b3204f37606972b40fc17dec84560c22f69f6
5 +X-next-at: f2d1464379e7567b01b55fbf8432e75d72aa537f
6
7 -What's cooking in git.git (Jun 2020, #02; Wed, 10)
7 +What's cooking in git.git (Jun 2020, #03; Wed, 17)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12 '+' are in 'next'. The ones marked with '.' do not appear in any of
13 the integration branches, but I am still holding onto them.
14
15 -The tip of 'next' has been rewound and rebuilt.
16 -
15 You can find the changes described here in the integration branches
16 of the repositories listed at
17
@@ -22,244 +20,231 @@ of the repositories listed at
20 --------------------------------------------------
21 [Graduated to "master"]
22
25 -* bc/filter-process (2020-05-21) 2 commits
26 - (merged to 'next' on 2020-05-24 at 3d51328096)
27 - + t2060: add a test for switch with --orphan and --discard-changes
28 - + builtin/checkout: simplify metadata initialization
29 -
30 - Code simplification and test coverage enhancement.
31 -
23 +* dl/python-2.7-is-the-floor-version (2020-06-08) 1 commit
24 + (merged to 'next' on 2020-06-10 at ad3269ff40)
25 + + CodingGuidelines: specify Python 2.7 is the oldest version
26
33 -* cb/bisect-helper-parser-fix (2020-05-24) 1 commit
34 - (merged to 'next' on 2020-05-24 at d30e10fa86)
35 - + bisect--helper: avoid segfault with bad syntax in `start --term-*`
27 + Document that we do not support Python 2.6 or older.
28
37 - The code to parse "git bisect start" command line was lax in
38 - validating the arguments.
29
30 +* dl/t-readme-spell-git-correctly (2020-06-08) 1 commit
31 + (merged to 'next' on 2020-06-10 at 60144a59ed)
32 + + t/README: avoid poor-man's small caps GIT
33
41 -* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
42 - (merged to 'next' on 2020-05-24 at c03b4095fa)
43 - + t4210: detect REG_ILLSEQ dynamically and skip affected tests
44 - + t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
34 + Doc updates.
35
46 - As FreeBSD is not the only platform whose regexp library reports
47 - a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
48 - automatically and skip the affected tests.
36
37 +* en/do-match-pathspec-fix (2020-06-05) 1 commit
38 + (merged to 'next' on 2020-06-10 at 2e63c8c0fc)
39 + + dir: fix treatment of negated pathspecs
40
51 -* cc/upload-pack-data (2020-05-18) 13 commits
52 - (merged to 'next' on 2020-05-29 at 66008d9209)
53 - + upload-pack: use upload_pack_data fields in receive_needs()
54 - + upload-pack: pass upload_pack_data to create_pack_file()
55 - + upload-pack: remove static variable 'stateless_rpc'
56 - + upload-pack: pass upload_pack_data to check_non_tip()
57 - + upload-pack: pass upload_pack_data to send_ref()
58 - + upload-pack: move symref to upload_pack_data
59 - + upload-pack: use upload_pack_data writer in receive_needs()
60 - + upload-pack: pass upload_pack_data to receive_needs()
61 - + upload-pack: pass upload_pack_data to get_common_commits()
62 - + upload-pack: use 'struct upload_pack_data' in upload_pack()
63 - + upload-pack: move 'struct upload_pack_data' around
64 - + upload-pack: move {want,have}_obj to upload_pack_data
65 - + upload-pack: remove unused 'wants' from upload_pack_data
66 - (this branch is used by cc/upload-pack-data-2.)
41 + Use of negative pathspec, while collecting paths including
42 + untracked ones in the working tree, was broken.
43
68 - Code clean-up.
44
45 +* en/sparse-checkout (2020-06-05) 1 commit
46 + (merged to 'next' on 2020-06-10 at 697a10b031)
47 + + sparse-checkout: avoid staging deletions of all files
48
71 -* dl/remote-curl-deadlock-fix (2020-05-24) 7 commits
72 - (merged to 'next' on 2020-05-26 at 072714ca7f)
73 - + stateless-connect: send response end packet
74 - + pkt-line: define PACKET_READ_RESPONSE_END
75 - + remote-curl: error on incomplete packet
76 - + pkt-line: extern packet_length()
77 - + transport: extract common fetch_pack() call
78 - + remote-curl: remove label indentation
79 - + remote-curl: fix typo
49 + The behaviour of "sparse-checkout" in the state "git clone
50 + --no-checkout" left was changed accidentally in 2.27, which has
51 + been corrected.
52
81 - On-the-wire protocol v2 easily falls into a deadlock between the
82 - remote-curl helper and the fetch-pack process when the server side
83 - prematurely throws an error and disconnects. The communication has
84 - been updated to make it more robust.
53
54 +* es/advertise-contribution-doc (2020-06-08) 1 commit
55 + (merged to 'next' on 2020-06-10 at c72c7da667)
56 + + docs: mention MyFirstContribution in more places
57
87 -* ds/line-log-on-bloom (2020-05-11) 5 commits
88 - (merged to 'next' on 2020-05-11 at 046d49d455)
89 - + line-log: integrate with changed-path Bloom filters
90 - + line-log: try to use generation number-based topo-ordering
91 - + line-log: more responsive, incremental 'git log -L'
92 - + t4211-line-log: add tests for parent oids
93 - + line-log: remove unused fields from 'struct line_log_data'
94 - (this branch is used by sg/commit-graph-cleanups.)
58 + Doc updates.
59
96 - "git log -L..." now takes advantage of the "which paths are touched
97 - by this commit?" info stored in the commit-graph system.
60
61 +* hn/refs-cleanup (2020-06-09) 6 commits
62 + (merged to 'next' on 2020-06-09 at abb59f83a2)
63 + + reftable: define version 2 of the spec to accomodate SHA256
64 + + reftable: clarify how empty tables should be written
65 + + reftable: file format documentation
66 + + refs: improve documentation for ref iterator
67 + + t: use update-ref and show-ref to reading/writing refs
68 + + refs.h: clarify reflog iteration order
69 + (this branch is used by hn/reftable.)
70
100 -* es/bugreport-shell (2020-05-12) 2 commits
101 - (merged to 'next' on 2020-05-24 at 79c5c8308b)
102 - + bugreport: include user interactive shell
103 - + help: add shell-path to --build-options
71 + Preliminary clean-ups around refs API, plus file format
72 + specification documentation for the reftable backend.
73
105 - "git bugreport" learns to report what shell is in use.
106 - We may want to learn more details than just the path, but
107 - that can come later.
108 - cf. <20200512235924.GC6605@camp.crustytoothpaste.net>
74
75 +* jk/diff-memuse-optim-with-stat-unmatch (2020-06-02) 1 commit
76 + (merged to 'next' on 2020-06-10 at 4cea3bfaac)
77 + + diff: discard blob data from stat-unmatched pairs
78
111 -* js/checkout-p-new-file (2020-05-27) 1 commit
112 - (merged to 'next' on 2020-05-31 at 017c325bf6)
113 - + checkout -p: handle new files correctly
79 + Reduce memory usage during "diff --quiet" in a worktree with too
80 + many stat-unmatched paths.
81
115 - "git checkout -p" did not handle a newly added path at all.
82
83 +* js/fuzz-commit-graph-leakfix (2020-06-08) 1 commit
84 + (merged to 'next' on 2020-06-10 at 92944ed7f6)
85 + + fuzz-commit-graph: properly free graph struct
86
118 -* jt/curl-verbose-on-trace-curl (2020-05-11) 2 commits
119 - (merged to 'next' on 2020-05-11 at 814e31b9d4)
120 - + http, imap-send: stop using CURLOPT_VERBOSE
121 - + t5551: test that GIT_TRACE_CURL redacts password
122 - (this branch is used by jt/redact-all-cookies.)
87 + Leakfix.
88
124 - Rewrite support for GIT_CURL_VERBOSE in terms of GIT_TRACE_CURL.
89
90 +* js/msvc-build-fix (2020-06-04) 1 commit
91 + (merged to 'next' on 2020-06-10 at 167a629359)
92 + + msvc: fix "REG_STARTEND" issue
93
127 -* rs/fsck-duplicate-names-in-trees (2020-05-21) 4 commits
128 - (merged to 'next' on 2020-05-24 at 6e1d6ba087)
129 - + fsck: detect more in-tree d/f conflicts
130 - + t1450: demonstrate undetected in-tree d/f conflict
131 - + t1450: increase test coverage of in-tree d/f detection
132 - + fsck: fix a typo in a comment
94 + Workaround breakage in MSVC build, where "curl-config --cflags"
95 + gives settings appropriate for GCC build.
96
134 - The check in "git fsck" to ensure that the tree objects are sorted
135 - still had corner cases it missed unsorted entries.
97
98 +* js/reflog-anonymize-for-clone-and-fetch (2020-06-04) 1 commit
99 + (merged to 'next' on 2020-06-10 at 2901ff943e)
100 + + clone/fetch: anonymize URLs in the reflog
101
138 -* tb/commit-graph-no-check-oids (2020-05-18) 8 commits
139 - (merged to 'next' on 2020-05-24 at 72bd1063ca)
140 - + commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag
141 - + t5318: reorder test below 'graph_read_expect'
142 - + commit-graph.c: simplify 'fill_oids_from_commits'
143 - + builtin/commit-graph.c: dereference tags in builtin
144 - + builtin/commit-graph.c: extract 'read_one_commit()'
145 - + commit-graph.c: peel refs in 'add_ref_to_set'
146 - + commit-graph.c: show progress of finding reachable commits
147 - + commit-graph.c: extract 'refs_cb_data'
102 + The reflog entries for "git clone" and "git fetch" did not
103 + anonymize the URL they operated on.
104
149 - Clean-up the commit-graph codepath.
105
106 +* tb/t5318-cleanup (2020-06-04) 2 commits
107 + (merged to 'next' on 2020-06-10 at 5a72620cbe)
108 + + t5318: test that '--stdin-commits' respects '--[no-]progress'
109 + + t5318: use 'test_must_be_empty'
110
152 -* vs/complete-stash-show-p-fix (2020-05-21) 1 commit
153 - (merged to 'next' on 2020-05-24 at fcbff29a0f)
154 - + completion: don't override given stash subcommand with -p
155 -
156 - The command line completion script (in contrib/) tried to complete
157 - "git stash -p" as if it were "git stash push -p", but it was too
158 - aggressive and also affected "git stash show -p", which has been
159 - corrected.
111 + Code cleanup.
112
113 --------------------------------------------------
114 [New Topics]
115
164 -* en/sparse-checkout (2020-06-05) 1 commit
165 - - sparse-checkout: avoid staging deletions of all files
166 -
167 - The behaviour of "sparse-checkout" in the state "git clone
168 - --no-checkout" left was changed accidentally in 2.27, which has
169 - been corrected.
116 +* cc/upload-pack-data-3 (2020-06-11) 14 commits
117 + (merged to 'next' on 2020-06-17 at 393eff577a)
118 + + upload-pack: refactor common code into do_got_oid()
119 + + upload-pack: move oldest_have to upload_pack_data
120 + + upload-pack: pass upload_pack_data to got_oid()
121 + + upload-pack: pass upload_pack_data to ok_to_give_up()
122 + + upload-pack: pass upload_pack_data to send_acks()
123 + + upload-pack: pass upload_pack_data to process_haves()
124 + + upload-pack: change allow_unadvertised_object_request to an enum
125 + + upload-pack: move allow_unadvertised_object_request to upload_pack_data
126 + + upload-pack: move extra_edge_obj to upload_pack_data
127 + + upload-pack: move shallow_nr to upload_pack_data
128 + + upload-pack: pass upload_pack_data to send_unshallow()
129 + + upload-pack: pass upload_pack_data to deepen_by_rev_list()
130 + + upload-pack: pass upload_pack_data to deepen()
131 + + upload-pack: pass upload_pack_data to send_shallow_list()
132 + (this branch uses cc/upload-pack-data-2)
133 +
134 + Code clean-up in the codepath that serves "git fetch" continues.
135
171 - Will merge to 'next'.
136 + Will merge to 'master'.
137
138
174 -* js/msvc-build-fix (2020-06-04) 1 commit
175 - - msvc: fix "REG_STARTEND" issue
139 +* ct/diff-with-merge-base-clarification (2020-06-12) 3 commits
140 + (merged to 'next' on 2020-06-17 at e0b54a001c)
141 + + Documentation: usage for diff combined commits
142 + + git diff: improve range handling
143 + + t/t3430: avoid undefined git diff behavior
144
177 - Workaround breakage in MSVC build, where "curl-config --cflags"
178 - gives settings appropriate for GCC build.
145 + "git diff" used to take arguments in random and nonsense range
146 + notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
147 + which has been cleaned up.
148
180 - Will merge to 'next'.
149 + Will merge to 'master'.
150
151
183 -* en/do-match-pathspec-fix (2020-06-05) 1 commit
184 - - dir: fix treatment of negated pathspecs
152 +* js/default-branch-name (2020-06-10) 9 commits
153 + - Document how the default branch name can be overridden
154 + - fast-export: respect the possibly-overridden default branch name
155 + - fmt-merge-msg: learn about the possibly-configured default branch name
156 + - clone: learn about the possibly-configured default branch name
157 + - submodule: use the (possibly overridden) default branch name
158 + - testsvn: respect `core.defaultBranchName`
159 + - send-pack/transport-helper: respect `core.defaultBranchName`
160 + - remote: respect `core.defaultBranchName`
161 + - init: allow overriding the default branch name for new repositories
162
186 - Use of negative pathspec, while collecting paths including
187 - untracked ones in the working tree, was broken.
163 + The name of the primary branch in existing repositories, and the
164 + default name used for the first branch in newly created
165 + repositories, is made configurable, so that we can eventually wean
166 + ourselves off of the hardcoded 'master'.
167
189 - Will merge to 'next'.
168 + Expecting a reroll.
169
170
192 -* jt/redact-all-cookies (2020-06-05) 1 commit
193 - - http: redact all cookies, teach GIT_TRACE_REDACT=0
171 +* jt/cdn-offload (2020-06-17) 10 commits
172 + - upload-pack: fix a sparse '0 as NULL pointer' warning
173 + - upload-pack: send part of packfile response as uri
174 + - fetch-pack: support more than one pack lockfile
175 + - upload-pack: refactor reading of pack-objects out
176 + - Documentation: add Packfile URIs design doc
177 + - Documentation: order protocol v2 sections
178 + - http-fetch: support fetching packfiles by URL
179 + - http-fetch: refactor into function
180 + - http: refactor finish_http_pack_request()
181 + - http: use --stdin when indexing dumb HTTP pack
182 + (this branch uses cc/upload-pack-data-2)
183
195 - The interface to redact sensitive information in the trace output
196 - has been simplified.
184 + The "fetch/clone" protocol has been updated to allow the server to
185 + instruct the clients to grab pre-packaged packfile(s) in addition
186 + to the packed object data coming over the wire.
187
188 Will merge to 'next'.
189
190
201 -* dl/python-2.7-is-the-floor-version (2020-06-08) 1 commit
202 - - CodingGuidelines: specify Python 2.7 is the oldest version
203 -
204 - Document that we do not support Python 2.6 or older.
191 +* ss/cmake-build (2020-06-12) 8 commits
192 + - ci: modification of main.yml to use cmake for vs-build job
193 + - cmake: support for building git on windows with msvc and clang.
194 + - cmake: support for building git on windows with mingw
195 + - cmake: support for testing git when building out of the source tree
196 + - cmake: support for testing git with ctest
197 + - cmake: installation support for git
198 + - cmake: generate the shell/perl/python scripts and templates, translations
199 + - Introduce CMake support for configuring Git
200
206 - Will merge to 'next'.
201 + CMake support to build with MSVC for Windows bypassing the Makefile.
202
203 + Almost there.
204
209 -* dl/t-readme-spell-git-correctly (2020-06-08) 1 commit
210 - - t/README: avoid poor-man's small caps GIT
205
212 - Doc updates.
206 +* ak/commit-graph-to-slab (2020-06-17) 4 commits
207 + - commit-graph: minimize commit_graph_data_slab access
208 + - commit: move members graph_pos, generation to a slab
209 + - commit-graph: introduce commit_graph_data_slab
210 + - object: drop parsed_object_pool->commit_count
211
214 - Will merge to 'next'.
212 + A few fields in "struct commit" that do not have to always be
213 + present have been moved to commit slabs.
214
215
217 -* es/advertise-contribution-doc (2020-06-08) 1 commit
218 - - docs: mention MyFirstContribution in more places
216 +* en/clean-cleanups (2020-06-12) 4 commits
217 + (merged to 'next' on 2020-06-17 at 2c4ec990a6)
218 + + clean: optimize and document cases where we recurse into subdirectories
219 + + clean: consolidate handling of ignored parameters
220 + + dir, clean: avoid disallowed behavior
221 + + dir: fix a few confusing comments
222
220 - Doc updates.
223 + "git clean" code clean-up that resulted in a fix of recent
224 + performance regression.
225
222 - Will merge to 'next'.
226 + Will merge to 'master'.
227
228
225 -* es/worktree-duplicate-paths (2020-06-10) 7 commits
226 - - worktree: make "move" refuse to move atop missing registered worktree
227 - - worktree: generalize candidate worktree path validation
228 - - worktree: prune linked worktree referencing main worktree path
229 - - worktree: prune duplicate entries referencing same worktree path
230 - - worktree: make high-level pruning re-usable
231 - - worktree: give "should be pruned?" function more meaningful name
232 - - worktree: factor out repeated string literal
229 +* dl/branch-cleanup (2020-06-17) 3 commits
230 + - branch: don't mix --edit-description
231 + - t3200: test for specific errors
232 + - t3200: rename "expected" to "expect"
233
234 - The same worktree directory must be registered only once, but
235 - "git worktree move" allowed this invariant to be violated, which
236 - has been corrected.
234 + Code clean-up around "git branch" with a minor bugfix.
235
236 Will merge to 'next'.
237
238
241 -* js/fuzz-commit-graph-leakfix (2020-06-08) 1 commit
242 - - fuzz-commit-graph: properly free graph struct
239 +* ds/merge-base-is-ancestor-optim (2020-06-17) 2 commits
240 + - commit-reach: use fast logic in repo_in_merge_base
241 + - commit-reach: create repo_is_descendant_of()
242
244 - Leakfix.
243 + "git merge-base --is-ancestor" is taught to take advantage of the
244 + commit graph.
245
246 Will merge to 'next'.
247
248 -
249 -* sg/commit-graph-cleanups (2020-06-08) 10 commits
250 - - commit-graph: simplify write_commit_graph_file() #2
251 - - commit-graph: simplify write_commit_graph_file() #1
252 - - commit-graph: simplify parse_commit_graph() #2
253 - - commit-graph: simplify parse_commit_graph() #1
254 - - commit-graph: clean up #includes
255 - - diff.h: drop diff_tree_oid() & friends' return value
256 - - commit-slab: add a function to deep free entries on the slab
257 - - commit-graph-format.txt: all multi-byte numbers are in network byte order
258 - - commit-graph: fix parsing the Chunk Lookup table
259 - - tree-walk.c: don't match submodule entries for 'submod/anything'
260 -
261 - Code cleanup.
262 -
248 --------------------------------------------------
249 [Stalled]
250
@@ -276,21 +261,6 @@ of the repositories listed at
261 cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
262
263
279 -* dl/test-must-fail-fixes-5 (2020-05-21) 5 commits
280 - - lib-submodule-update: pass OVERWRITING_FAIL
281 - - SQUASH??? <20200521112545.GB581643@generichostname>
282 - - lib-submodule-update: prepend "git" to $command
283 - - lib-submodule-update: consolidate --recurse-submodules
284 - - lib-submodule-update: add space after function name
285 -
286 - The effort to avoid using test_must_fail on non-git command continues.
287 -
288 - Expecting a reroll.
289 - cf. <20200521182928.GA1308647@coredump.intra.peff.net>
290 - The last step is a bit too ugly to live; Peff seems to have better
291 - ideas.
292 -
293 -
264 * mr/bisect-in-c-2 (2020-04-23) 12 commits
265 - bisect--helper: retire `--bisect-autostart` subcommand
266 - bisect--helper: retire `--write-terms` subcommand
@@ -321,51 +291,87 @@ of the repositories listed at
291 --------------------------------------------------
292 [Cooking]
293
324 -* jk/diff-memuse-optim-with-stat-unmatch (2020-06-02) 1 commit
325 - - diff: discard blob data from stat-unmatched pairs
294 +* dl/test-must-fail-fixes-5 (2020-06-12) 4 commits
295 + - lib-submodule-update: use callbacks in test_submodule_switch_common()
296 + - lib-submodule-update: prepend "git" to $command
297 + - lib-submodule-update: consolidate --recurse-submodules
298 + - lib-submodule-update: add space after function name
299
327 - Reduce memory usage during "diff --quiet" in a worktree with too
328 - many stat-unmatched paths.
300 + The effort to avoid using test_must_fail on non-git command continues.
301
330 - Will merge to 'next'.
302 + Ready???
303
304
333 -* js/reflog-anonymize-for-clone-and-fetch (2020-06-04) 1 commit
334 - - clone/fetch: anonymize URLs in the reflog
305 +* jt/redact-all-cookies (2020-06-05) 1 commit
306 + (merged to 'next' on 2020-06-12 at 912c337d63)
307 + + http: redact all cookies, teach GIT_TRACE_REDACT=0
308
336 - The reflog entries for "git clone" and "git fetch" did not
337 - anonymize the URL they operated on.
309 + The interface to redact sensitive information in the trace output
310 + has been simplified.
311
339 - Will merge to 'next'.
312 + Will merge to 'master'.
313
314
342 -* tb/t5318-cleanup (2020-06-04) 2 commits
343 - - t5318: test that '--stdin-commits' respects '--[no-]progress'
344 - - t5318: use 'test_must_be_empty'
315 +* es/worktree-duplicate-paths (2020-06-10) 7 commits
316 + (merged to 'next' on 2020-06-12 at 5f7c822a9d)
317 + + worktree: make "move" refuse to move atop missing registered worktree
318 + + worktree: generalize candidate worktree path validation
319 + + worktree: prune linked worktree referencing main worktree path
320 + + worktree: prune duplicate entries referencing same worktree path
321 + + worktree: make high-level pruning re-usable
322 + + worktree: give "should be pruned?" function more meaningful name
323 + + worktree: factor out repeated string literal
324
346 - Code cleanup.
325 + The same worktree directory must be registered only once, but
326 + "git worktree move" allowed this invariant to be violated, which
327 + has been corrected.
328 +
329 + Will merge to 'master'.
330
348 - Will merge to 'next'.
331 +
332 +* sg/commit-graph-cleanups (2020-06-17) 18 commits
333 + - commit-graph: persist existence of changed-paths
334 + - commit-graph: change test to die on parse, not load
335 + - bloom: enforce a minimum size of 8 bytes
336 + - commit-graph: check all leading directories in changed path Bloom filters
337 + - commit-graph: check chunk sizes after writing
338 + - commit-graph: simplify chunk writes into loop
339 + - commit-graph: unify the signatures of all write_graph_chunk_*() functions
340 + - commit-graph: place bloom_settings in context
341 + - commit-graph: simplify write_commit_graph_file() #2
342 + - commit-graph: simplify write_commit_graph_file() #1
343 + - commit-graph: simplify parse_commit_graph() #2
344 + - commit-graph: simplify parse_commit_graph() #1
345 + - commit-graph: clean up #includes
346 + - diff.h: drop diff_tree_oid() & friends' return value
347 + - commit-slab: add a function to deep free entries on the slab
348 + - commit-graph-format.txt: all multi-byte numbers are in network byte order
349 + - commit-graph: fix parsing the Chunk Lookup table
350 + - tree-walk.c: don't match submodule entries for 'submod/anything'
351 +
352 + Code cleanup.
353
354
355 * cc/upload-pack-data-2 (2020-06-04) 13 commits
352 - - upload-pack: move pack_objects_hook to upload_pack_data
353 - - upload-pack: move allow_sideband_all to upload_pack_data
354 - - upload-pack: move allow_ref_in_want to upload_pack_data
355 - - upload-pack: move allow_filter to upload_pack_data
356 - - upload-pack: move keepalive to upload_pack_data
357 - - upload-pack: pass upload_pack_data to upload_pack_config()
358 - - upload-pack: change multi_ack to an enum
359 - - upload-pack: move multi_ack to upload_pack_data
360 - - upload-pack: move filter_capability_requested to upload_pack_data
361 - - upload-pack: move use_sideband to upload_pack_data
362 - - upload-pack: move static vars to upload_pack_data
363 - - upload-pack: annotate upload_pack_data fields
364 - - upload-pack: actually use some upload_pack_data bitfields
356 + (merged to 'next' on 2020-06-12 at ee63b70dc2)
357 + + upload-pack: move pack_objects_hook to upload_pack_data
358 + + upload-pack: move allow_sideband_all to upload_pack_data
359 + + upload-pack: move allow_ref_in_want to upload_pack_data
360 + + upload-pack: move allow_filter to upload_pack_data
361 + + upload-pack: move keepalive to upload_pack_data
362 + + upload-pack: pass upload_pack_data to upload_pack_config()
363 + + upload-pack: change multi_ack to an enum
364 + + upload-pack: move multi_ack to upload_pack_data
365 + + upload-pack: move filter_capability_requested to upload_pack_data
366 + + upload-pack: move use_sideband to upload_pack_data
367 + + upload-pack: move static vars to upload_pack_data
368 + + upload-pack: annotate upload_pack_data fields
369 + + upload-pack: actually use some upload_pack_data bitfields
370 + (this branch is used by cc/upload-pack-data-3 and jt/cdn-offload.)
371
372 Further code clean-up.
373
368 - Will merge to 'next'.
374 + Will merge to 'master'.
375
376
377 * xl/upgrade-repo-format (2020-06-05) 4 commits
@@ -377,39 +383,45 @@ of the repositories listed at
383 Allow runtime upgrade of the repository format version, which needs
384 to be done carefully.
385
380 - Almost there. It does not seem to play well with hn/reftable
386 + There is a rather unpleasant backward compatibility worry with the
387 + last step of this series, but it is the right thing to do in the
388 + longer term.
389 +
390 + Will merge to 'next'.
391
392
393 * jk/complete-git-switch (2020-05-28) 16 commits
384 - - completion: improve handling of --orphan option of switch/checkout
385 - - completion: improve handling of -c/-C and -b/-B in switch/checkout
386 - - completion: improve handling of --track in switch/checkout
387 - - completion: improve handling of --detach in checkout
388 - - completion: improve completion for git switch with no options
389 - - completion: improve handling of DWIM mode for switch/checkout
390 - - completion: perform DWIM logic directly in __git_complete_refs
391 - - completion: extract function __git_dwim_remote_heads
392 - - completion: replace overloaded track term for __git_complete_refs
393 - - completion: add tests showing subpar switch/checkout --orphan logic
394 - - completion: add tests showing subpar -c/C argument completion
395 - - completion: add tests showing subpar -c/-C startpoint completion
396 - - completion: add tests showing subpar switch/checkout --track logic
397 - - completion: add tests showing subar checkout --detach logic
398 - - completion: add tests showing subpar DWIM logic for switch/checkout
399 - - completion: add test showing subpar git switch completion
394 + (merged to 'next' on 2020-06-17 at 5b31140c0a)
395 + + completion: improve handling of --orphan option of switch/checkout
396 + + completion: improve handling of -c/-C and -b/-B in switch/checkout
397 + + completion: improve handling of --track in switch/checkout
398 + + completion: improve handling of --detach in checkout
399 + + completion: improve completion for git switch with no options
400 + + completion: improve handling of DWIM mode for switch/checkout
401 + + completion: perform DWIM logic directly in __git_complete_refs
402 + + completion: extract function __git_dwim_remote_heads
403 + + completion: replace overloaded track term for __git_complete_refs
404 + + completion: add tests showing subpar switch/checkout --orphan logic
405 + + completion: add tests showing subpar -c/C argument completion
406 + + completion: add tests showing subpar -c/-C startpoint completion
407 + + completion: add tests showing subpar switch/checkout --track logic
408 + + completion: add tests showing subar checkout --detach logic
409 + + completion: add tests showing subpar DWIM logic for switch/checkout
410 + + completion: add test showing subpar git switch completion
411
412 The command line completion (in contrib/) learned to complete
413 options that the "git switch" command takes.
414
404 - Is this ready?
415 + Will merge to 'master'.
416
417
407 -* en/sparse-with-submodule-doc (2020-05-25) 1 commit
408 - - git-sparse-checkout: clarify interactions with submodules
418 +* en/sparse-with-submodule-doc (2020-06-12) 1 commit
419 + (merged to 'next' on 2020-06-17 at 3521be3834)
420 + + git-sparse-checkout: clarify interactions with submodules
421
422 The effect of sparse checkout settings on submodules is documented.
423
412 - Needs review.
424 + Will merge to 'master'.
425
426
427 * ss/submodule-set-branch-in-c (2020-06-02) 1 commit
@@ -419,8 +431,7 @@ of the repositories listed at
431 continues; this time it is "git submodule set-branch" subcommand's
432 turn.
433
422 - Almost there.
423 - cf. <1b851e49-3bb1-3b59-7f24-b903c5514391@gmail.com>
434 + Will merge to 'next'.
435
436
437 * es/config-hooks (2020-05-21) 4 commits
@@ -431,6 +442,8 @@ of the repositories listed at
442
443 The "hooks defined in config" topic.
444
445 + Ready???
446 +
447
448 * pw/rebase-i-more-options (2020-05-27) 5 commits
449 - rebase: add --reset-author-date
@@ -445,20 +458,19 @@ of the repositories listed at
458 cf. <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>
459
460
448 -* mt/grep-sparse-checkout (2020-06-02) 6 commits
449 - - git.c: fix sparse warning
461 +* mt/grep-sparse-checkout (2020-06-12) 6 commits
462 - config: add setting to ignore sparsity patterns in some cmds
463 - grep: honor sparse checkout patterns
464 - config: correctly read worktree configs in submodules
465 + - t/helper/test-config: facilitate addition of new cli options
466 - t/helper/test-config: return exit codes consistently
467 - doc: grep: unify info on configuration variables
468
469 "git grep" has been tweaked to be limited to the sparse checkout
470 paths.
471
459 - Expecting a reroll.
460 - cf. <cover.1590627264.git.matheus.bernardino@usp.br>
461 - cf. <CABPp-BFsCPPNOZ92JQRJeGyNd0e-TCW-LcLyr0i_+VSQJP+GCg@mail.gmail.com>
472 + Review needed on 4/6; otherwise looking sane.
473 + cf. <CABPp-BGdEyEeajYZj_rdxp=MyEQdszuyjVTax=hhYj3fOtRQUQ@mail.gmail.com>
474
475
476 * bc/sha-256-part-2 (2020-05-27) 44 commits
@@ -509,6 +521,8 @@ of the repositories listed at
521
522 SHA-256 migration work continues.
523
524 + Ready???
525 +
526
527 * jx/proc-receive-hook (2020-05-18) 11 commits
528 - doc: add documentation for the proc-receive hook
@@ -529,23 +543,9 @@ of the repositories listed at
543 Needs review.
544
545
532 -* hn/refs-cleanup (2020-06-09) 6 commits
533 - (merged to 'next' on 2020-06-09 at abb59f83a2)
534 - + reftable: define version 2 of the spec to accomodate SHA256
535 - + reftable: clarify how empty tables should be written
536 - + reftable: file format documentation
537 - + refs: improve documentation for ref iterator
538 - + t: use update-ref and show-ref to reading/writing refs
539 - + refs.h: clarify reflog iteration order
540 - (this branch is used by hn/reftable.)
541 -
542 - Preliminary clean-ups around refs API, plus file format
543 - specification documentation for the reftable backend.
544 -
545 - Will merge to 'master'.
546 -
547 -
548 -* hn/reftable (2020-06-09) 14 commits
546 +* hn/reftable (2020-06-17) 18 commits
547 + . SQUASH??? whitespace breakage fix
548 + . Add "test-tool dump-reftable" command.
549 . Add reftable testing infrastructure
550 . vcxproj: adjust for the reftable changes
551 . Add GIT_DEBUG_REFS debugging mechanism
@@ -560,15 +560,14 @@ of the repositories listed at
560 . Treat BISECT_HEAD as a pseudo ref
561 . Make refs_ref_exists public
562 . Write pseudorefs through ref backends.
563 - (this branch uses hn/refs-cleanup.)
563 + . checkout: add '\n' to reflog message
564 + . lib-t6000.sh: write tag using git-update-ref
565
566 A new refs backend "reftable" to replace the traditional
567 combination of packed-refs files and one-file-per-ref loose refs
568 has been implemented and integrated for improved performance and
569 atomicity.
570
570 - Does not seem to build from the source.
571 -
571 --------------------------------------------------
572 [Discarded]
573