@matheusbsbs / matheus-bagliano / commits / a729dda74f

What's cooking (2020/11 #01)

Junio C Hamano committed Nov 2, 2020 at 14:26 UTC a729dda74fd376e6c9a3d09902ac1c9d438f5aba
1 file changed +466 -431
whats-cooking.txt
+466 -431
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Oct 2020, #05; Thu, 29)
4 -X-master-at: ad27df6a5cff694add500ab8c7f97234feb4a91f
5 -X-next-at: ac1ea6bc6f5e42993b67661c5b0e2e7396ac2607
3 +Subject: What's cooking in git.git (Nov 2020, #01; Mon, 2)
4 +X-master-at: 7f7ebe054af6d831b999d6c2241b9227c4e4e08d
5 +X-next-at: 8a58376a318e85947bf4bf3a28f36953a18963f5
6
7 -What's cooking in git.git (Oct 2020, #05; Thu, 29)
7 +What's cooking in git.git (Nov 2020, #01; Mon, 2)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,9 +12,9 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
12 with '+' 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 -Git 2.29.2 has been tagged. About 30+ topics are in 'next' waiting
16 -their turns to graduate to 'master', while a handful more of topics
17 -in 'seen' are marked to graduate to 'next'.
15 +The third batch of topics in this cycle are in 'master' now,
16 +including some microprojects by candidates for the Outreachy
17 +program.
18
19 Copies of the source code to Git live in many repositories, and the
20 following is a list of the ones I push into. Some repositories have
@@ -43,31 +43,383 @@ Release tarballs are available at:
43
44 https://www.kernel.org/pub/software/scm/git/
45
46 +--------------------------------------------------
47 +[Graduated to 'master']
48 +
49 +* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
50 + (merged to 'next' on 2020-10-26 at 644026c2f6)
51 + + hook: add sample template for push-to-checkout
52 +
53 + Add a sample 'push-to-checkout' hook, that performs the same as
54 + what the built-in default action does.
55 +
56 +
57 +* bc/svn-hash-oid-fix (2020-10-21) 1 commit
58 + (merged to 'next' on 2020-10-26 at 743b549d5d)
59 + + svn: use correct variable name for short OID
60 +
61 + A recent oid->hash conversion missed one spot, breaking "git svn".
62 +
63 +
64 +* bk/sob-dco (2020-10-20) 4 commits
65 + (merged to 'next' on 2020-10-26 at d0e5066a7e)
66 + + Documentation: stylistically normalize references to Signed-off-by:
67 + + SubmittingPatches: clarify DCO is our --signoff rule
68 + + Documentation: clarify and expand description of --signoff
69 + + doc: preparatory clean-up of description on the sign-off option
70 +
71 + Document that the meaning of a Signed-off-by trailer can vary from
72 + project to project in the end-user documentation, and clarify what
73 + it means to this project.
74 +
75 +
76 +* cm/t7xxx-cleanup (2020-10-22) 6 commits
77 + (merged to 'next' on 2020-10-26 at 8b58e54942)
78 + + t7102: prepare expected output inside test_expect_* block
79 + + t7201: put each command on a separate line
80 + + t7201: use 'git -C' to avoid subshell
81 + + t7102,t7201: remove whitespace after redirect operator
82 + + t7102,t7201: remove unnecessary blank spaces in test body
83 + + t7101,t7102,t7201: modernize test formatting
84 +
85 + Originally merged to 'next' on 2020-10-23
86 +
87 + Micro clean-up.
88 +
89 +
90 +* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
91 + (merged to 'next' on 2020-10-26 at 9b70aa748f)
92 + + t0000: use test_path_is_file instead of "test -f"
93 +
94 + Originally merged to 'next' on 2020-10-23
95 +
96 + Micro clean-up of a test script.
97 +
98 +
99 +* dl/diff-merge-base (2020-09-21) 10 commits
100 + (merged to 'next' on 2020-10-26 at 114d94030b)
101 + + contrib/completion: complete `git diff --merge-base`
102 + + builtin/diff-tree: learn --merge-base
103 + + builtin/diff-index: learn --merge-base
104 + + t4068: add --merge-base tests
105 + + diff-lib: define diff_get_merge_base()
106 + + diff-lib: accept option flags in run_diff_index()
107 + + contrib/completion: extract common diff/difftool options
108 + + git-diff.txt: backtick quote command text
109 + + git-diff-index.txt: make --cached description a proper sentence
110 + + t4068: remove unnecessary >tmp
111 +
112 + "git diff A...B" learned "git diff --merge-base A B", which is a
113 + longer short-hand to say the same thing.
114 +
115 +
116 +* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
117 + (merged to 'next' on 2020-10-26 at 7e94297aa4)
118 + + contrib/git-resurrect.sh: use hash-agnostic OID pattern
119 + + contrib/git-resurrect.sh: indent with tabs
120 +
121 + Originally merged to 'next' on 2020-10-23
122 +
123 + "git resurrect" script (in contrib/) learned that the object names
124 + may be longer than 40-hex depending on the hash function in use.
125 +
126 +
127 +* ds/commit-graph-merging-fix (2020-10-09) 2 commits
128 + (merged to 'next' on 2020-10-26 at a0cf763826)
129 + + commit-graph: don't write commit-graph when disabled
130 + + commit-graph: ignore duplicates when merging layers
131 +
132 + When "git commit-graph" detects the same commit recorded more than
133 + once while it is merging the layers, it used to die. The code now
134 + ignores all but one of them and continues.
135 +
136 +
137 +* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
138 + (merged to 'next' on 2020-10-26 at 429d1371d8)
139 + + maintenance: core.commitGraph=false prevents writes
140 + + maintenance: test commit-graph auto condition
141 +
142 + Test-coverage enhancement of running commit-graph task "git
143 + maintenance" as needed led to discovery and fix of a bug.
144 +
145 +
146 +* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
147 + (merged to 'next' on 2020-10-26 at 1234e8297f)
148 + + sequencer: remove duplicate rollback_lock_file() call
149 +
150 + Code clean-up.
151 +
152 +
153 +* en/t7518-unflake (2020-10-18) 1 commit
154 + (merged to 'next' on 2020-10-26 at 443459f7ca)
155 + + t7518: fix flaky grep invocation
156 +
157 + Originally merged to 'next' on 2020-10-23
158 +
159 + Work around flakiness in a test.
160 +
161 +
162 +* en/test-selector (2020-10-18) 3 commits
163 + (merged to 'next' on 2020-10-26 at 3d6e77c3ff)
164 + + test-lib: reduce verbosity of skipped tests
165 + + t6006, t6012: adjust tests to use 'setup' instead of synonyms
166 + + test-lib: allow selecting tests by substring/glob with --run
167 +
168 + Our test scripts can be told to run only individual pieces while
169 + skipping others with the "--run=..." option; they were taught to
170 + take a substring of test title, in addition to numbers, to name the
171 + test pieces to run.
172 +
173 +
174 +* es/test-cmp-typocatcher (2020-10-20) 1 commit
175 + (merged to 'next' on 2020-10-26 at 62d89db753)
176 + + Revert "test_cmp: diagnose incorrect arguments"
177 +
178 + A test helper "test_cmp A B" was taught to diagnose missing files A
179 + or B as a bug in test, but some tests legitimately wanted to notice
180 + a failure to even create file B as an error, in addition to leaving
181 + the expected result in it, and were misdiagnosed as a bug. This
182 + has been corrected.
183 +
184 +
185 +* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
186 + (merged to 'next' on 2020-10-28 at 96e0d84d94)
187 + + MyFirstContribution: clarify asciidoc dependency
188 +
189 + Doc update.
190 +
191 +
192 +* jc/doc-final-resend (2020-10-26) 1 commit
193 + (merged to 'next' on 2020-10-30 at 2dd2c8a0d9)
194 + + SubmittingPatches: clarify the purpose of the final resend
195 +
196 + Update developer doc.
197 +
198 +
199 +* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
200 + (merged to 'next' on 2020-10-26 at 2f0a73fd48)
201 + + fast-import: fix over-allocation of marks storage
202 +
203 + "git fast-import" wasted a lot of memory when many marks were in use.
204 +
205 +
206 +* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
207 + (merged to 'next' on 2020-10-26 at 1ba987dd54)
208 + + fast-import: remove duplicated option-parsing line
209 +
210 + Code clean-up.
211 +
212 +
213 +* jk/no-common (2020-10-16) 1 commit
214 + (merged to 'next' on 2020-10-26 at c888cb8b28)
215 + + config.mak.dev: build with -fno-common
216 +
217 + Dev support to catch a tentative definition of a variable in our C
218 + code as an error.
219 +
220 +
221 +* jk/report-fn-typedef (2020-10-16) 1 commit
222 + (merged to 'next' on 2020-10-26 at fa4e128b65)
223 + + usage: define a type for a reporting function
224 +
225 + Code clean-up.
226 +
227 +
228 +* js/avoid-split-sideband-message (2020-10-27) 3 commits
229 + (merged to 'next' on 2020-10-27 at 06b2f75522)
230 + + test-pkt-line: drop colon from sideband identity
231 + (merged to 'next' on 2020-10-26 at 1b550f3245)
232 + + sideband: report unhandled incomplete sideband messages as bugs
233 + + sideband: avoid reporting incomplete sideband messages
234 + (this branch is used by jk/sideband-more-error-checking.)
235 +
236 + The side-band status report can be sent at the same time as the
237 + primary payload multiplexed, but the demultiplexer on the receiving
238 + end incorrectly split a single status report into two, which has
239 + been corrected.
240 +
241 +
242 +* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
243 + (merged to 'next' on 2020-10-26 at 4832a8f40b)
244 + + ci: make the "skip-if-redundant" check more defensive
245 + + ci: work around old records of GitHub runs
246 +
247 + Originally merged to 'next' on 2020-10-23
248 +
249 + GitHub Actions automated test improvement to skip tests on a tree
250 + identical to what has already been tested.
251 +
252 +
253 +* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
254 + (merged to 'next' on 2020-10-26 at 0a66b76c66)
255 + + t1400: prepare for `main` being default branch name
256 + + tests: prepare aligned mentions of the default branch name
257 + + t9902: prepare a test for the upcoming default branch name
258 + + t3200: prepare for `main` being shorter than `master`
259 + + t5703: adjust a test case for the upcoming default branch name
260 + + t6200: adjust suppression pattern to also match "main"
261 + + tests: start moving to a different default main branch name
262 + + t9801: use `--` in preparation for default branch rename
263 + + fmt-merge-msg: also suppress "into main" by default
264 + (this branch is used by js/default-branch-name-adjust-t5411.)
265 +
266 + Adjust tests so that they won't scream when the default initial
267 + branch name is changed to 'main'.
268 +
269 +
270 +* js/t7006-cleanup (2020-10-21) 1 commit
271 + (merged to 'next' on 2020-10-26 at b8582f842d)
272 + + t7006: Use test_path_is_* functions in test script
273 +
274 + Code clean-up.
275 +
276 +
277 +* jt/apply-reverse-twice (2020-10-20) 1 commit
278 + (merged to 'next' on 2020-10-26 at f060893eb7)
279 + + apply: when -R, also reverse list of sections
280 +
281 + "git apply -R" did not handle patches that touch the same path
282 + twice correctly, which has been corrected. This is most relevant
283 + in a patch that changes a path from a regular file to a symbolic
284 + link (and vice versa).
285 +
286 +
287 +* lo/zsh-completion (2020-10-16) 1 commit
288 + (merged to 'next' on 2020-10-26 at 100dc6adde)
289 + + completion: fix zsh installation instructions
290 +
291 + Update instructions for command line completion (in contrib/) for zsh.
292 +
293 +
294 +* mk/diff-ignore-regex (2020-10-20) 2 commits
295 + (merged to 'next' on 2020-10-26 at c68727da93)
296 + + diff: add -I<regex> that ignores matching changes
297 + + merge-base, xdiff: zero out xpparam_t structures
298 +
299 + "git diff" family of commands learned the "-I<regex>" option to
300 + ignore hunks whose changed lines all match the given pattern.
301 +
302 +
303 +* nk/dir-c-comment-update (2020-10-16) 1 commit
304 + (merged to 'next' on 2020-10-26 at 3a4cb82ad6)
305 + + dir.c: fix comments to agree with argument name
306 +
307 + Update stale in-code comment.
308 +
309 +
310 +* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
311 + (merged to 'next' on 2020-10-26 at e1c956e52a)
312 + + t3435: add tests for rebase -r GPG signing
313 + + sequencer: pass explicit --no-gpg-sign to merge
314 + + sequencer: fix gpg option passed to merge subcommand
315 +
316 + "git rebase --rebase-merges" did not correctly pass --gpg-sign
317 + command line option to underlying "git merge" when replaying a merge
318 + using non-default merge strategy or when replaying an octopus merge
319 + (because replaying a two-head merge with the default strategy was
320 + done in a separate codepath, the problem did not trigger for most
321 + users), which has been corrected.
322 +
323 +
324 +* tk/credential-config (2020-10-16) 1 commit
325 + (merged to 'next' on 2020-10-26 at 6ab486f389)
326 + + credential: load default config
327 +
328 + "git credential' didn't honor the core.askPass configuration
329 + variable (among other things), which has been corrected.
330 +
331 +
332 +* ve/userdiff-bash (2020-10-22) 1 commit
333 + (merged to 'next' on 2020-10-26 at 2b34be98fe)
334 + + userdiff: support Bash
335 +
336 + The userdiff pattern learned to identify the function definition in
337 + POSIX shells and bash.
338 +
339 --------------------------------------------------
340 [New Topics]
341
49 -* jk/sideband-more-error-checking (2020-10-29) 1 commit
50 - - sideband: diagnose more sideband anomalies
51 - (this branch uses js/avoid-split-sideband-message.)
342 +* dd/upload-pack-stateless-eof (2020-10-30) 1 commit
343 + - upload-pack: allow stateless client EOF just prior to haves
344
53 - The code to detect premature EOF in the sideband demultiplexer has
54 - been cleaned up.
345
56 - Will merge to 'next'.
346 +* js/trace2-session-id (2020-10-31) 11 commits
347 + - upload-pack.c: fix a sparse warning
348 + - receive-pack: log received client trace2 SID
349 + - send-pack: advertise trace2 SID in capabilities
350 + - upload-pack, serve: log received client trace2 SID
351 + - fetch-pack: advertise trace2 SID in capabilities
352 + - transport: log received server trace2 SID
353 + - serve: advertise trace2 SID in v2 capabilities
354 + - receive-pack: advertise trace2 SID in v0 capabilities
355 + - upload-pack: advertise trace2 SID in v0 capabilities
356 + - docs: new trace2.advertiseSID option
357 + - docs: new capability to advertise trace2 SIDs
358
359
59 -* js/default-branch-name-adjust-t5411 (2020-10-28) 4 commits
60 - - t5411: finish preparing for `main` being the default branch name
61 - - t5411: adjust the remaining support files for init.defaultBranch=main
62 - - t5411: start adjusting the support files for init.defaultBranch=main
63 - - t5411: start using the default branch name "main"
64 - (this branch uses js/default-branch-name-part-4-minus-1.)
360 +* so/format-patch-doc-on-default-diff-format (2020-10-31) 1 commit
361 + - doc/diff-options: fix out of place mentions of '--patch/-p'
362 +
363 +
364 +* jc/sparse-error-for-developer-build (2020-10-31) 1 commit
365 + - Makefile: enable -Wsparse-error for DEVELOPER build
366 +
367 +
368 +* pb/blame-funcname-range-userdiff (2020-11-01) 8 commits
369 + - blame: simplify 'setup_blame_bloom_data' interface
370 + - blame: simplify 'setup_scoreboard' interface
371 + - blame: enable funcname blaming with userdiff driver
372 + - line-log: mention both modes in 'blame' and 'log' short help
373 + - doc: add more pointers to gitattributes(5) for userdiff
374 + - blame-options.txt: also mention 'funcname' in '-L' description
375 + - doc: line-range: improve formatting
376 + - doc: log, gitk: move '-L' description to 'line-range-options.txt'
377
66 - Prepare a test script to transition of the default branch name to
67 - 'main'.
378
69 - Other than a minor nit, overall it looked sensible.
70 - cf. <xmqq5z6u9kkv.fsf@gitster.c.googlers.com>
379 +* rs/clear-commit-marks-in-repo (2020-10-31) 2 commits
380 + - bisect: clear flags in passed repository
381 + - object: allow clear_commit_marks_all to handle any repo
382 +
383 +
384 +* rs/empty-stash-check-fix (2020-11-01) 1 commit
385 + - stash: simplify reflog emptiness check
386 +
387 +
388 +* rs/pack-write-hashwrite-simplify (2020-11-01) 1 commit
389 + - pack-write: use hashwrite_be32() instead of double-buffering array
390 +
391 +
392 +* sd/prompt-local-variable (2020-11-01) 1 commit
393 + - git-prompt.sh: localize `option` in __git_ps1_show_upstream
394 +
395 +
396 +* so/log-diff-merge (2020-11-01) 26 commits
397 + - doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
398 + - doc/diff-generate-patch: mention new --diff-merges option
399 + - doc/git-log: describe new --diff-merges options
400 + - t4013: add test for --diff-merges=first-parent
401 + - diff-merges: implement new values for --diff-merges
402 + - diff-merges: make -m/-c/--cc explicitly mutually exclusive
403 + - diff-merges: refactor opt settings into separate functions
404 + - diff-merges: get rid of now empty diff_merges_init_revs()
405 + - diff-merges: group diff-merge flags next to each other inside 'rev_info'
406 + - diff-merges: split 'ignore_merges' field
407 + - diff-merges: fix -m to properly override -c/--cc
408 + - t4013: add tests for -m failing to override -c/--cc
409 + - t4013: support test_expect_failure through ':failure' magic
410 + - diff-merges: revise revs->diff flag handling
411 + - diff-merges: introduce revs->first_parent_merges flag
412 + - diff-merges: new function diff_merges_set_dense_combined_if_unset()
413 + - diff-merges: new function diff_merges_suppress()
414 + - diff-merges: re-arrange functions to match the order they are called in
415 + - diff-merges: rename diff_merges_default_to_enable() to match semantics
416 + - diff-merges: move checks for first_parent_only out of the module
417 + - diff-merges: rename all functions to have common prefix
418 + - revision: move diff merges functions to its own diff-merges.c
419 + - revision: provide implementation for diff merges tweaks
420 + - revision: factor out initialization of diff-merge related settings
421 + - revision: factor out setup of diff-merge related settings
422 + - revision: factor out parsing of diff-merge related options
423
424 --------------------------------------------------
425 [Stalled]
@@ -191,48 +543,54 @@ Release tarballs are available at:
543 updated to use "size_t".
544
545 --------------------------------------------------
194 -[Cooking]
546 +[Needs Review]
547
196 -* cm/t7xxx-cleanup (2020-10-22) 6 commits
197 - (merged to 'next' on 2020-10-26 at 8b58e54942)
198 - + t7102: prepare expected output inside test_expect_* block
199 - + t7201: put each command on a separate line
200 - + t7201: use 'git -C' to avoid subshell
201 - + t7102,t7201: remove whitespace after redirect operator
202 - + t7102,t7201: remove unnecessary blank spaces in test body
203 - + t7101,t7102,t7201: modernize test formatting
548 +* ag/merge-strategies-in-c (2020-10-06) 11 commits
549 + . sequencer: use the "octopus" merge strategy without forking
550 + . sequencer: use the "resolve" strategy without forking
551 + . merge: use the "octopus" strategy without forking
552 + . merge: use the "resolve" strategy without forking
553 + . merge-octopus: rewrite in C
554 + . merge-recursive: move better_branch_name() to merge.c
555 + . merge-resolve: rewrite in C
556 + . merge-index: don't fork if the requested program is `git-merge-one-file'
557 + . merge-index: libify merge_one_path() and merge_all()
558 + . merge-one-file: rewrite in C
559 + . t6027: modernise tests
560
205 - Originally merged to 'next' on 2020-10-23
561 + The resolve and octopus merge strategy backends have been rewritten
562 + in C.
563
207 - Micro clean-up.
564
209 - Will merge to 'master'.
565 +* ss/submodule-add-in-c (2020-10-07) 3 commits
566 + . t7400: add test to check 'submodule add' for tracked paths
567 + . submodule: port submodule subcommand 'add' from shell to C
568 + . dir: change the scope of function 'directory_exists_in_index()'
569
570 + "git submodule add" being rewritten in C.
571
212 -* js/avoid-split-sideband-message (2020-10-27) 3 commits
213 - (merged to 'next' on 2020-10-27 at 06b2f75522)
214 - + test-pkt-line: drop colon from sideband identity
215 - (merged to 'next' on 2020-10-26 at 1b550f3245)
216 - + sideband: report unhandled incomplete sideband messages as bugs
217 - + sideband: avoid reporting incomplete sideband messages
218 - (this branch is used by jk/sideband-more-error-checking.)
572 +--------------------------------------------------
573 +[Cooking]
574
220 - The side-band status report can be sent at the same time as the
221 - primary payload multiplexed, but the demultiplexer on the receiving
222 - end incorrectly split a single status report into two, which has
223 - been corrected.
575 +* jk/sideband-more-error-checking (2020-10-29) 1 commit
576 + (merged to 'next' on 2020-10-30 at 8131784691)
577 + + sideband: diagnose more sideband anomalies
578 +
579 + The code to detect premature EOF in the sideband demultiplexer has
580 + been cleaned up.
581
582 Will merge to 'master'.
583
584
228 -* jt/apply-reverse-twice (2020-10-20) 1 commit
229 - (merged to 'next' on 2020-10-26 at f060893eb7)
230 - + apply: when -R, also reverse list of sections
585 +* js/default-branch-name-adjust-t5411 (2020-10-31) 4 commits
586 + (merged to 'next' on 2020-11-02 at d625eda73c)
587 + + t5411: finish preparing for `main` being the default branch name
588 + + t5411: adjust the remaining support files for init.defaultBranch=main
589 + + t5411: start adjusting the support files for init.defaultBranch=main
590 + + t5411: start using the default branch name "main"
591
232 - "git apply -R" did not handle patches that touch the same path
233 - twice correctly, which has been corrected. This is most relevant
234 - in a patch that changes a path from a regular file to a symbolic
235 - link (and vice versa).
592 + Prepare a test script to transition of the default branch name to
593 + 'main'.
594
595 Will merge to 'master'.
596
@@ -247,26 +605,9 @@ Release tarballs are available at:
605 cf. <20201022183822.GA781760@nand.local>
606
607
250 -* bc/svn-hash-oid-fix (2020-10-21) 1 commit
251 - (merged to 'next' on 2020-10-26 at 743b549d5d)
252 - + svn: use correct variable name for short OID
253 -
254 - A recent oid->hash conversion missed one spot, breaking "git svn".
255 -
256 - Will merge to 'master'.
257 -
258 -
259 -* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
260 - (merged to 'next' on 2020-10-26 at 1234e8297f)
261 - + sequencer: remove duplicate rollback_lock_file() call
262 -
263 - Code clean-up.
264 -
265 - Will merge to 'master'.
266 -
267 -
608 * jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
269 - - sequencer: tolerate abbreviated stopped-sha file
609 + (merged to 'next' on 2020-11-02 at ba3dd9eaf4)
610 + + sequencer: tolerate abbreviated stopped-sha file
611
612 Recently the format of an internal state file "rebase -i" uses has
613 been tightened up for consistency, which would hurt those who start
@@ -274,8 +615,7 @@ Release tarballs are available at:
615 the reader side a bit (which we may want to tighten again in a year
616 or so).
617
277 - Is this a real issue, or just a theoretical one? Perhaps drop?
278 - cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
618 + Will merge to 'master'
619
620
621 * jk/perl-warning (2020-10-21) 1 commit
@@ -288,37 +628,10 @@ Release tarballs are available at:
628 cf. <20201022032400.GC1480820@coredump.intra.peff.net>
629
630
291 -* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
292 - (merged to 'next' on 2020-10-26 at 0a66b76c66)
293 - + t1400: prepare for `main` being default branch name
294 - + tests: prepare aligned mentions of the default branch name
295 - + t9902: prepare a test for the upcoming default branch name
296 - + t3200: prepare for `main` being shorter than `master`
297 - + t5703: adjust a test case for the upcoming default branch name
298 - + t6200: adjust suppression pattern to also match "main"
299 - + tests: start moving to a different default main branch name
300 - + t9801: use `--` in preparation for default branch rename
301 - + fmt-merge-msg: also suppress "into main" by default
302 - (this branch is used by js/default-branch-name-adjust-t5411.)
303 -
304 - Adjust tests so that they won't scream when the default initial
305 - branch name is changed to 'main'.
306 -
307 - Will merge to 'master'.
308 -
309 -
310 -* js/t7006-cleanup (2020-10-21) 1 commit
311 - (merged to 'next' on 2020-10-26 at b8582f842d)
312 - + t7006: Use test_path_is_* functions in test script
313 -
314 - Code clean-up.
315 -
316 - Will merge to 'master'.
317 -
318 -
631 * pb/ref-filter-with-crlf (2020-10-29) 2 commits
320 - - log, show: add tests for messages containing CRLF
321 - - ref-filter: handle CRLF at end-of-line more gracefully
632 + (merged to 'next' on 2020-10-30 at 8be77584c5)
633 + + log, show: add tests for messages containing CRLF
634 + + ref-filter: handle CRLF at end-of-line more gracefully
635
636 A commit and tag object may have CR at the end of each and
637 every line (you can create such an object with hash-object or
@@ -327,26 +640,17 @@ Release tarballs are available at:
640 to separate the title from the body of the message. Be lenient
641 and accept a line with lone CR on it as a blank line, too.
642
330 - Will merge to 'next'.
331 -
332 -
333 -* ve/userdiff-bash (2020-10-22) 1 commit
334 - (merged to 'next' on 2020-10-26 at 2b34be98fe)
335 - + userdiff: support Bash
336 -
337 - The userdiff pattern learned to identify the function definition in
338 - POSIX shells and bash.
339 -
643 Will merge to 'master'.
644
645
646 * ab/git-remote-exit-code (2020-10-27) 1 commit
344 - - remote: add meaningful exit code on missing/existing
647 + (merged to 'next' on 2020-10-30 at 1fc119404b)
648 + + remote: add meaningful exit code on missing/existing
649
650 Exit codes from "git remote add" etc. were not usable by scripted
651 callers.
652
349 - Will merge to 'next'.
653 + Will merge to 'master'.
654
655
656 * en/merge-ort-api-null-impl (2020-10-29) 4 commits
@@ -376,11 +680,12 @@ Release tarballs are available at:
680
681
682 * jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
379 - - am, sequencer: stop parsing our own committer ident
683 + (merged to 'next' on 2020-10-30 at 9ba3fad57d)
684 + + am, sequencer: stop parsing our own committer ident
685
381 - Code symplification.
686 + Code simplification.
687
383 - Will merge to 'next'.
688 + Will merge to 'master'.
689
690
691 * sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
@@ -395,48 +700,41 @@ Release tarballs are available at:
700 Needs doc update.
701
702
398 -* fc/zsh-completion (2020-10-28) 29 commits
399 - - zsh: update copyright notices
400 - - completion: bash: remove old compat wrappers
401 - - completion: bash: cleanup cygwin check
402 - - completion: bash: trivial cleanup
403 - - completion: zsh: add simple version check
404 - - completion: zsh: trivial simplification
405 - - completion: zsh: add alias descriptions
406 - - completion: zsh: improve command tags
407 - - completion: zsh: refactor command completion
408 - - completion: zsh: shuffle functions around
409 - - completion: zsh: simplify file_direct
410 - - completion: zsh: simplify nl_append
411 - - completion: zsh: trivial cleanup
412 - - completion: zsh: simplify direct compadd
413 - - completion: zsh: simplify compadd functions
414 - - completion: zsh: fix splitting of words
415 - - completion: zsh: add missing direct_append
416 - - completion: fix conflict with bashcomp
417 - - completion: zsh: fix completion for --no-.. options
418 - - completion: bash: remove zsh wrapper
419 - - completion: bash: synchronize zsh wrapper
420 - - completion: zsh: fix for command aliasing
421 - - completion: prompt: fix color for Zsh
422 - - completion: zsh: update slave script locations
423 - - completion: zsh: fix for directories with spaces
424 - - completion: zsh: reorganize install instructions
425 - - completion: zsh: fix bash script extension
426 - - completion: zsh: fix name due to broken autoloading
427 - - completion: zsh: fix __gitcomp_direct()
428 -
429 - Zsh autocompletion (in contrib/) update.
430 -
431 - Will merge to 'next'.
432 -
433 -
434 -* jc/doc-final-resend (2020-10-26) 1 commit
435 - - SubmittingPatches: clarify the purpose of the final resend
703 +* fc/zsh-completion (2020-10-28) 29 commits
704 + (merged to 'next' on 2020-11-02 at 2c5e3a73ad)
705 + + zsh: update copyright notices
706 + + completion: bash: remove old compat wrappers
707 + + completion: bash: cleanup cygwin check
708 + + completion: bash: trivial cleanup
709 + + completion: zsh: add simple version check
710 + + completion: zsh: trivial simplification
711 + + completion: zsh: add alias descriptions
712 + + completion: zsh: improve command tags
713 + + completion: zsh: refactor command completion
714 + + completion: zsh: shuffle functions around
715 + + completion: zsh: simplify file_direct
716 + + completion: zsh: simplify nl_append
717 + + completion: zsh: trivial cleanup
718 + + completion: zsh: simplify direct compadd
719 + + completion: zsh: simplify compadd functions
720 + + completion: zsh: fix splitting of words
721 + + completion: zsh: add missing direct_append
722 + + completion: fix conflict with bashcomp
723 + + completion: zsh: fix completion for --no-.. options
724 + + completion: bash: remove zsh wrapper
725 + + completion: bash: synchronize zsh wrapper
726 + + completion: zsh: fix for command aliasing
727 + + completion: prompt: fix color for Zsh
728 + + completion: zsh: update slave script locations
729 + + completion: zsh: fix for directories with spaces
730 + + completion: zsh: reorganize install instructions
731 + + completion: zsh: fix bash script extension
732 + + completion: zsh: fix name due to broken autoloading
733 + + completion: zsh: fix __gitcomp_direct()
734
437 - Update developer doc.
735 + Zsh autocompletion (in contrib/) update.
736
439 - Will merge to 'next'.
737 + Will merge to 'master'.
738
739
740 * nk/perf-fsmonitor (2020-10-26) 10 commits
@@ -456,14 +754,15 @@ Release tarballs are available at:
754
755
756 * jk/checkout-index-errors (2020-10-27) 2 commits
459 - - checkout-index: propagate errors to exit code
460 - - checkout-index: drop error message from empty --stage=all
757 + (merged to 'next' on 2020-10-30 at 77dddffe1b)
758 + + checkout-index: propagate errors to exit code
759 + + checkout-index: drop error message from empty --stage=all
760 (this branch is used by mt/parallel-checkout-part-1.)
761
762 "git checkout-index" did not consistently signal an error with its
763 exit status.
764
466 - Will merge to 'next'.
765 + Will merge to 'master'.
766
767
768 * pw/rebase-i-orig-head (2020-10-27) 4 commits
@@ -479,13 +778,16 @@ Release tarballs are available at:
778 cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
779
780
482 -* en/strmap (2020-10-13) 10 commits
781 +* en/strmap (2020-11-02) 13 commits
782 + - Use new HASHMAP_INIT macro to simplify hashmap initialization
783 + - strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
784 - strmap: enable allocations to come from a mem_pool
785 - strmap: add a strset sub-type
786 - strmap: add functions facilitating use as a string->int map
787 - strmap: enable faster clearing and reusing of strmaps
788 - strmap: add more utility functions
789 - strmap: new utility functions
790 + - hashmap: provide deallocation function names
791 - hashmap: introduce a new hashmap_partial_clear()
792 - hashmap: allow re-use after hashmap_free()
793 - hashmap: adjust spacing to fix argument alignment
@@ -494,34 +796,11 @@ Release tarballs are available at:
796 A speciailization of hashmap that uses a string as key has been
797 introduced. Hopefully it will see wider use over time.
798
497 - On hold.
799 + Rerolled.
800 cf. <20201023080202.GA4012156@coredump.intra.peff.net>
801 cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>
802
803
502 -* en/test-selector (2020-10-18) 3 commits
503 - (merged to 'next' on 2020-10-26 at 3d6e77c3ff)
504 - + test-lib: reduce verbosity of skipped tests
505 - + t6006, t6012: adjust tests to use 'setup' instead of synonyms
506 - + test-lib: allow selecting tests by substring/glob with --run
507 -
508 - Our test scripts can be told to run only individual pieces while
509 - skipping others with the "--run=..." option; they were taught to
510 - take a substring of test title, in addition to numbers, to name the
511 - test pices to run.
512 -
513 - Will merge to 'master'.
514 -
515 -
516 -* jk/report-fn-typedef (2020-10-16) 1 commit
517 - (merged to 'next' on 2020-10-26 at fa4e128b65)
518 - + usage: define a type for a reporting function
519 -
520 - Code clean-up.
521 -
522 - Will merge to 'master'.
523 -
524 -
804 * mr/bisect-in-c-3 (2020-10-16) 7 commits
805 (merged to 'next' on 2020-10-28 at 435792b62f)
806 + bisect--helper: retire `--bisect-autostart` subcommand
@@ -537,32 +816,6 @@ Release tarballs are available at:
816 Will merge to 'master'.
817
818
540 -* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
541 - (merged to 'next' on 2020-10-26 at e1c956e52a)
542 - + t3435: add tests for rebase -r GPG signing
543 - + sequencer: pass explicit --no-gpg-sign to merge
544 - + sequencer: fix gpg option passed to merge subcommand
545 -
546 - "git rebase --rebase-merges" did not correctly pass --gpg-sign
547 - command line option to underying "git merge" when replaying a merge
548 - using non-default merge strategy or when replaying an octopus merge
549 - (because replaying a two-head merge with the default strategy was
550 - done in a separate codepath, the problem did not trigger for most
551 - users), which has been corrected.
552 -
553 - Will merge to 'master'.
554 -
555 -
556 -* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
557 - (merged to 'next' on 2020-10-26 at 644026c2f6)
558 - + hook: add sample template for push-to-checkout
559 -
560 - Add a sample 'push-to-checkout' hook, that performs the same as
561 - what the built-in default action does.
562 -
563 - Will merge to 'master'.
564 -
565 -
819 * as/tests-cleanup (2020-10-18) 1 commit
820 (merged to 'next' on 2020-10-28 at fd199beb31)
821 + t2200,t9832: avoid using 'git' upstream in a pipe
@@ -572,31 +825,6 @@ Release tarballs are available at:
825 Will merge to 'master'.
826
827
575 -* bk/sob-dco (2020-10-20) 4 commits
576 - (merged to 'next' on 2020-10-26 at d0e5066a7e)
577 - + Documentation: stylistically normalize references to Signed-off-by:
578 - + SubmittingPatches: clarify DCO is our --signoff rule
579 - + Documentation: clarify and expand description of --signoff
580 - + doc: preparatory clean-up of description on the sign-off option
581 -
582 - Document that the meaning of a Signed-off-by trailer can vary from
583 - project to project in the end-user documentation, and clarify what
584 - it means to this project.
585 -
586 - Will merge to 'master'.
587 -
588 -
589 -* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
590 - (merged to 'next' on 2020-10-26 at 9b70aa748f)
591 - + t0000: use test_path_is_file instead of "test -f"
592 -
593 - Originally merged to 'next' on 2020-10-23
594 -
595 - Micro clean-up of a test script.
596 -
597 - Will merge to 'master'.
598 -
599 -
828 * en/dir-rename-tests (2020-10-16) 4 commits
829 (merged to 'next' on 2020-10-28 at 7bbe123e70)
830 + t6423: more involved rules for renaming directories into each other
@@ -611,89 +839,6 @@ Release tarballs are available at:
839 Will merge to 'master'.
840
841
614 -* en/t7518-unflake (2020-10-18) 1 commit
615 - (merged to 'next' on 2020-10-26 at 443459f7ca)
616 - + t7518: fix flaky grep invocation
617 -
618 - Originally merged to 'next' on 2020-10-23
619 -
620 - Work around flakiness in a test.
621 -
622 - Will merge to 'master'.
623 -
624 -
625 -* es/test-cmp-typocatcher (2020-10-20) 1 commit
626 - (merged to 'next' on 2020-10-26 at 62d89db753)
627 - + Revert "test_cmp: diagnose incorrect arguments"
628 -
629 - A test helper "test_cmp A B" was taught to diagnose missing files A
630 - or B as a bug in test, but some tests legitimately wanted to notice
631 - a failure to even create file B as an error, in addition to leaving
632 - the expected result in it, and were misdiagnosed as a bug. This
633 - has been corrected.
634 -
635 - Will merge to 'master'.
636 -
637 -
638 -* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
639 - (merged to 'next' on 2020-10-28 at 96e0d84d94)
640 - + MyFirstContribution: clarify asciidoc dependency
641 -
642 - Doc update.
643 -
644 - Will merge to 'master'.
645 -
646 -
647 -* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
648 - (merged to 'next' on 2020-10-26 at 2f0a73fd48)
649 - + fast-import: fix over-allocation of marks storage
650 -
651 - "git fast-import" wasted a lot of memory when many marks were in use.
652 -
653 - Will merge to 'master'.
654 -
655 -
656 -* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
657 - (merged to 'next' on 2020-10-26 at 1ba987dd54)
658 - + fast-import: remove duplicated option-parsing line
659 -
660 - Code clean-up.
661 -
662 - Will merge to 'master'.
663 -
664 -
665 -* jk/no-common (2020-10-16) 1 commit
666 - (merged to 'next' on 2020-10-26 at c888cb8b28)
667 - + config.mak.dev: build with -fno-common
668 -
669 - Dev support to catch a tentative definition of a variable in our C
670 - code as an error.
671 -
672 - Will merge to 'master'.
673 -
674 -
675 -* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
676 - (merged to 'next' on 2020-10-26 at 4832a8f40b)
677 - + ci: make the "skip-if-redundant" check more defensive
678 - + ci: work around old records of GitHub runs
679 -
680 - Originally merged to 'next' on 2020-10-23
681 -
682 - GitHub Actions automated test improvement to skip tests on a tree
683 - identical to what has already been tested.
684 -
685 - Will merge to 'master'.
686 -
687 -
688 -* lo/zsh-completion (2020-10-16) 1 commit
689 - (merged to 'next' on 2020-10-26 at 100dc6adde)
690 - + completion: fix zsh installation instructions
691 -
692 - Update instructions for command line completion (in contrib/) for zsh.
693 -
694 - Will merge to 'master'.
695 -
696 -
842 * nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
843 (merged to 'next' on 2020-10-28 at d3af804056)
844 + p7519-fsmonitor: add a git add benchmark
@@ -712,42 +857,6 @@ Release tarballs are available at:
857 Will merge to 'master'.
858
859
715 -* nk/dir-c-comment-update (2020-10-16) 1 commit
716 - (merged to 'next' on 2020-10-26 at 3a4cb82ad6)
717 - + dir.c: fix comments to agree with argument name
718 -
719 - Update stale in-code comment.
720 -
721 - Will merge to 'master'.
722 -
723 -
724 -* tk/credential-config (2020-10-16) 1 commit
725 - (merged to 'next' on 2020-10-26 at 6ab486f389)
726 - + credential: load default config
727 -
728 - "git credential' didn't honor the core.askPass configuration
729 - variable (among other things), which has been corrected.
730 -
731 - Will merge to 'master'.
732 -
733 -
734 -* ag/merge-strategies-in-c (2020-10-06) 11 commits
735 - - sequencer: use the "octopus" merge strategy without forking
736 - - sequencer: use the "resolve" strategy without forking
737 - - merge: use the "octopus" strategy without forking
738 - - merge: use the "resolve" strategy without forking
739 - - merge-octopus: rewrite in C
740 - - merge-recursive: move better_branch_name() to merge.c
741 - - merge-resolve: rewrite in C
742 - - merge-index: don't fork if the requested program is `git-merge-one-file'
743 - - merge-index: libify merge_one_path() and merge_all()
744 - - merge-one-file: rewrite in C
745 - - t6027: modernise tests
746 -
747 - The resolve and octopus merge strategy backends have been rewritten
748 - in C.
749 -
750 -
860 * jk/symlinked-dotgitx-files (2020-10-23) 9 commits
861 (merged to 'next' on 2020-10-26 at c1dd37b024)
862 + docs: document symlink restrictions for .git* files
@@ -772,50 +881,6 @@ Release tarballs are available at:
881 that probably is with potential consequences that is more grave?
882
883
775 -* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
776 - (merged to 'next' on 2020-10-26 at 7e94297aa4)
777 - + contrib/git-resurrect.sh: use hash-agnostic OID pattern
778 - + contrib/git-resurrect.sh: indent with tabs
779 -
780 - Originally merged to 'next' on 2020-10-23
781 -
782 - "git resurrect" script (in contrib/) learned that the object names
783 - may be longer than 40-hex depending on the hash function in use.
784 -
785 - Will merge to 'master'.
786 -
787 -
788 -* ds/commit-graph-merging-fix (2020-10-09) 2 commits
789 - (merged to 'next' on 2020-10-26 at a0cf763826)
790 - + commit-graph: don't write commit-graph when disabled
791 - + commit-graph: ignore duplicates when merging layers
792 -
793 - When "git commit-graph" detects the same commit recorded more than
794 - once while it is merging the layers, it used to die. The code now
795 - ignores all but one of them and continues.
796 -
797 - Will merge to 'master'.
798 -
799 -
800 -* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
801 - (merged to 'next' on 2020-10-26 at 429d1371d8)
802 - + maintenance: core.commitGraph=false prevents writes
803 - + maintenance: test commit-graph auto condition
804 -
805 - Test-coverage enhancement of running commit-graph task "git
806 - maintenance" as needed led to discovery and fix of a bug.
807 -
808 - Will merge to 'master'.
809 -
810 -
811 -* ss/submodule-add-in-c (2020-10-07) 3 commits
812 - - t7400: add test to check 'submodule add' for tracked paths
813 - - submodule: port submodule subcommand 'add' from shell to C
814 - - dir: change the scope of function 'directory_exists_in_index()'
815 -
816 - "git submodule add" being rewritten in C.
817 -
818 -
884 * ak/corrected-commit-date (2020-10-08) 10 commits
885 - doc: add corrected commit date info
886 - commit-reach: use corrected commit dates in paint_down_to_common()
@@ -835,17 +900,6 @@ Release tarballs are available at:
900 cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
901
902
838 -* mk/diff-ignore-regex (2020-10-20) 2 commits
839 - (merged to 'next' on 2020-10-26 at c68727da93)
840 - + diff: add -I<regex> that ignores matching changes
841 - + merge-base, xdiff: zero out xpparam_t structures
842 -
843 - "git diff" family of commands learned the "-I<regex>" option to
844 - ignore hunks whose changed lines all match the given pattern.
845 -
846 - Will merge to 'master'.
847 -
848 -
903 * mt/parallel-checkout-part-1 (2020-10-29) 19 commits
904 - ci: run test round with parallel-checkout enabled
905 - parallel-checkout: add tests related to .gitattributes
@@ -871,25 +925,6 @@ Release tarballs are available at:
925 Parallel checkout.
926
927
874 -* dl/diff-merge-base (2020-09-21) 10 commits
875 - (merged to 'next' on 2020-10-26 at 114d94030b)
876 - + contrib/completion: complete `git diff --merge-base`
877 - + builtin/diff-tree: learn --merge-base
878 - + builtin/diff-index: learn --merge-base
879 - + t4068: add --merge-base tests
880 - + diff-lib: define diff_get_merge_base()
881 - + diff-lib: accept option flags in run_diff_index()
882 - + contrib/completion: extract common diff/difftool options
883 - + git-diff.txt: backtick quote command text
884 - + git-diff-index.txt: make --cached description a proper sentence
885 - + t4068: remove unnecessary >tmp
886 -
887 - "git diff A...B" learned "git diff --merge-base A B", which is a
888 - longer short-hand to say the same thing.
889 -
890 - Will merge to 'master'.
891 -
892 -
928 * ds/maintenance-part-3 (2020-10-16) 8 commits
929 - maintenance: add troubleshooting guide to docs
930 - maintenance: use 'incremental' strategy by default