@matheusbsbs / matheus-bagliano / commits / cf8cc213b7

What's cooking (2021/01 #01)

Junio C Hamano committed Jan 6, 2021 at 23:28 UTC cf8cc213b72d9480d4a3cb4ff98fd244710e582c
1 file changed +269 -134
whats-cooking.txt
+269 -134
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Dec 2020, #05; Mon, 28)
3 +Subject: What's cooking in git.git (Jan 2021, #01; Wed, 6)
4 X-master-at: 71ca53e8125e36efbda17293c50027d31681a41f
5 X-next-at: d98b1dd5eaa7327399716162c746c9bd3cac3866
6
7 -What's cooking in git.git (Dec 2020, #05; Mon, 28)
7 +What's cooking in git.git (Jan 2021, #01; Wed, 6)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,9 +12,8 @@ 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.30 final is out. I expect things will quiet down while people
16 -celebrate year-end and new year, unless a bad regression is found
17 -post release.
15 +https://github.com/git/git/runs/1660876025 shows that with a few
16 +topics excluded the tip of 'seen' passes the CI. Yay.
17
18 Copies of the source code to Git live in many repositories, and the
19 following is a list of the ones I push into or their mirrors. Some
@@ -45,87 +44,212 @@ Release tarballs are available at:
44 https://www.kernel.org/pub/software/scm/git/
45
46 --------------------------------------------------
48 -[Graduated to 'master']
47 +[New Topics]
48
50 -* dl/checkout-p-merge-base (2020-12-21) 1 commit
51 - (merged to 'next' on 2020-12-21 at 595dd32b56)
52 - + checkout -p: handle tree arguments correctly again
49 +* ab/branch-sort (2021-01-06) 5 commits
50 + - branch: show "HEAD detached" first under reverse sort
51 + - branch: use the "detached_head_first" sorting option
52 + - ref-filter: add a "detached_head_first" sorting option
53 + - branch tests: add to --sort tests
54 + - branch: change "--local" to "--list" in comment
55
54 - Fix to a regression introduced during this cycle.
56 + The implementation of "git branch --sort" wrt the detached HEAD
57 + display has always been hacky, which has been cleaned up.
58
59 + Will merge to 'next'.
60
57 -* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
58 - (merged to 'next' on 2020-12-18 at d15a382d4d)
59 - + tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
60 - + t9902: use `main` as initial branch name
61 - + t6302: use `main` as initial branch name
62 - + t5703: use `main` as initial branch name
63 - + t5510: use `main` as initial branch name
64 - + t5505: finalize transitioning to using the branch name `main`
65 - + t3205: finalize transitioning to using the branch name `main`
66 - + t3203: complete the transition to using the branch name `main`
67 - + t3201: finalize transitioning to using the branch name `main`
68 - + t3200: finish transitioning to the initial branch name `main`
69 - + t1400: use `main` as initial branch name
61
71 - Test coverage fix.
62 +* ab/coc-update-to-2.0 (2021-01-04) 3 commits
63 + - CoC: update to version 2.0 + local changes
64 + - CoC: explicitly take any whitespace breakage
65 + - CoC: Update word-wrapping to match upstream
66
67 + Update the Code-of-conduct to version 2.0 from the upstream (we've
68 + been using version 1.4).
69
74 -* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
75 - (merged to 'next' on 2020-12-18 at b819311529)
76 - + pack-redundant: fix crash when one packfile in repo
70 + The first step needs to be signed off by the author, and like the
71 + original discussion thread back in Sep 2019, it also needs to
72 + collect acks from list regulars to show support.
73
78 - "git pack-redandant" when there is only one packfile used to crash,
79 - which has been corrected.
74
75 +* ar/t6016-modernise (2021-01-04) 1 commit
76 + - t6016: move to lib-log-graph.sh framework
77
82 -* ma/maintenance-crontab-fix (2020-12-21) 3 commits
83 - (merged to 'next' on 2020-12-21 at 8cd8cc04f9)
84 - + t7900-maintenance: test for magic markers
85 - + gc: fix handling of crontab magic markers
86 - + git-maintenance.txt: add missing word
78 + Test update.
79
88 - Hotfix for a topic of this cycle.
80 + Will merge to 'next'.
81
82
91 -* nk/refspecs-negative-fix (2020-12-21) 2 commits
92 - (merged to 'next' on 2020-12-21 at 7d88169236)
93 - + negative-refspec: improve comment on query_matches_negative_refspec
94 - + negative-refspec: fix segfault on : refspec
83 +* dl/reflog-with-single-entry (2021-01-06) 2 commits
84 + - refs: allow @{n} to work with n-sized reflog
85 + - refs: factor out set_read_ref_cutoffs()
86
96 - Hotfix for recent regression.
87 + After expiring a reflog and making a single commit, the reflog for
88 + the branch would record a single entry that knows both @{0} and
89 + @{1}, but we failed to answer "what commit we was on?", i.e. @{1}
90
91
99 -* pb/doc-git-linkit-fix (2020-12-22) 1 commit
100 - (merged to 'next' on 2020-12-22 at 240a7a227c)
101 - + git.txt: fix typos in 'linkgit' macro invocation
92 +* ds/cache-tree-basics (2021-01-04) 9 commits
93 + - cache-tree: speed up consecutive path comparisons
94 + - cache-tree: use ce_namelen() instead of strlen()
95 + - index-format: discuss recursion of cached-tree better
96 + - index-format: update preamble to cached tree extension
97 + - cache-tree: trace regions for prime_cache_tree
98 + - cache-tree: trace regions for I/O
99 + - cache-tree: use trace2 in cache_tree_update()
100 + - unpack-trees: add trace2 regions
101 + - tree-walk: report recursion counts
102
103 - Docfix.
103 + Document, clean-up and optimize the code around the cache-tree
104 + extension in the index.
105
105 ---------------------------------------------------
106 -[New Topics]
106
108 -* es/perf-export-fix (2020-12-22) 1 commit
109 - (merged to 'next' on 2020-12-22 at d06b0379d9)
110 - + t/perf: avoid unnecessary test_export() recursion
107 +* ds/for-each-repo-noopfix (2021-01-06) 1 commit
108 + - for-each-repo: do nothing on empty config
109
112 - Tweak unneeded recursion from a test framework helper function.
110 + "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
111 + any repository when the configuration variable <var> is not defined
112 + even once.
113
114 - Will cook in 'next'.
114
115 +* ds/trace2-topo-walk (2021-01-04) 1 commit
116 + - revision: trace topo-walk statistics
117
117 -* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
118 - - git-p4: fix syncing file types with pattern
118 + The topological walk codepath is covered by new trace2 stats.
119
120 - Text encoding fix for "git p4".
120 + Will merge to 'next'.
121
122
123 -* fc/mergetool-automerge (2020-12-22) 1 commit
124 - - mergetool: add automerge configuration
123 +* en/ort-conflict-handling (2021-01-04) 10 commits
124 + - merge-ort: add handling for different types of files at same path
125 + - merge-ort: copy find_first_merges() implementation from merge-recursive.c
126 + - merge-ort: implement format_commit()
127 + - merge-ort: copy and adapt merge_submodule() from merge-recursive.c
128 + - merge-ort: copy and adapt merge_3way() from merge-recursive.c
129 + - merge-ort: flesh out implementation of handle_content_merge()
130 + - merge-ort: handle book-keeping around two- and three-way content merge
131 + - merge-ort: implement unique_path() helper
132 + - merge-ort: handle directory/file conflicts that remain
133 + - merge-ort: handle D/F conflict where directory disappears due to merge
134 + (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/merge-ort-recursive.)
135
126 - "git mergetool" feeds three versions (base, local and remote) of
127 - a conflicted path unmodified. The command learned to optionally
128 - prepare these files with unconflicted parts already resolved.
136 +
137 +* fc/completion-aliases-support (2021-01-04) 4 commits
138 + - completion: add proper public __git_complete
139 + - test: completion: add tests for __git_complete
140 + - completion: bash: improve function detection
141 + - completion: bash: add __git_have_func helper
142 +
143 +
144 +* ma/doc-pack-format-varint-for-sizes (2021-01-04) 1 commit
145 + - pack-format.txt: document sizes at start of delta data
146 +
147 + Doc update.
148 +
149 + Will merge to 'next'.
150 +
151 +
152 +* ma/more-opaque-lock-file (2021-01-06) 5 commits
153 + - read-cache: try not to peek into `struct {lock_,temp}file`
154 + - refs/files-backend: don't peek into `struct lock_file`
155 + - midx: don't peek into `struct lock_file`
156 + - commit-graph: don't peek into `struct lock_file`
157 + - builtin/gc: don't peek into `struct lock_file`
158 +
159 + Code clean-up.
160 +
161 + Will merge to 'next'.
162 +
163 +
164 +* ma/sha1-is-a-hash (2021-01-04) 4 commits
165 + - hash-lookup: rename from sha1-lookup
166 + - sha1-lookup: rename `sha1_pos()` as `hash_pos()`
167 + - object-file.c: rename from sha1-file.c
168 + - object-name.c: rename from sha1-name.c
169 +
170 + Retire more names with "sha1" in it.
171 +
172 + Will merge to 'next'.
173 +
174 +
175 +* ma/t1300-cleanup (2021-01-04) 3 commits
176 + - t1300: don't needlessly work with `core.foo` configs
177 + - t1300: remove duplicate test for `--file no-such-file`
178 + - t1300: remove duplicate test for `--file ../foo`
179 +
180 + Code clean-up.
181 +
182 + Will merge to 'next'.
183 +
184 +
185 +* mt/t4129-with-setgid-dir (2021-01-06) 1 commit
186 + - t4129: don't fail if setgid is set in the test directory
187 +
188 + Some tests expect that "ls -l" output has either '-' or 'x' for
189 + group executable bit, but setgid bit can be inherited from parent
190 + directory and make these fields 'S' or 's' instead, causing test
191 + failures.
192 +
193 + Will merge to 'next'.
194 +
195 +
196 +* nk/perf-fsmonitor-cleanup (2021-01-06) 1 commit
197 + - p7519: allow running without watchman prereq
198 +
199 + Test fix.
200 +
201 + Will merge to 'next'.
202 +
203 +
204 +* pb/doc-modules-git-work-tree-typofix (2021-01-04) 1 commit
205 + - gitmodules.txt: fix 'GIT_WORK_TREE' variable name
206 +
207 + Doc fix.
208 +
209 + Will merge to 'next'.
210 +
211 +
212 +* pb/mergetool-tool-help-fix (2021-01-06) 1 commit
213 + - mergetool--lib: fix '--tool-help' to correctly show available tools
214 +
215 + Fix 2.29 regression where "git mergetool --tool-help" fails to list
216 + all the available tools.
217 +
218 + Will merge to 'next'.
219 +
220 +
221 +* rs/rebase-commit-validation (2021-01-04) 1 commit
222 + - rebase: verify commit parameter
223 +
224 + Diagnose command line error early.
225 +
226 + Will merge to 'next'.
227 +
228 +
229 +* sg/t7800-difftool-robustify (2021-01-04) 1 commit
230 + . t7800-difftool: don't accidentally match tmp dirs
231 +
232 + Test fix.
233 +
234 + Not working on Windows.
235 + cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
236 +
237 +
238 +* ta/doc-typofix (2021-01-04) 1 commit
239 + - doc: fix some typos
240 +
241 + Doc fix.
242 +
243 + Will merge to 'next'.
244 +
245 +
246 +* zh/arg-help-format (2021-01-06) 2 commits
247 + - builtin/*: update usage format
248 + - parse-options: format argh like error messages
249 +
250 + Clean up option descriptions in "git cmd --help".
251 +
252 + Will merge to 'next'.
253
254 --------------------------------------------------
255 [Stalled]
@@ -144,27 +268,6 @@ Release tarballs are available at:
268 cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
269
270
147 -* ak/corrected-commit-date (2020-10-08) 10 commits
148 - - doc: add corrected commit date info
149 - - commit-reach: use corrected commit dates in paint_down_to_common()
150 - - commit-graph: use generation v2 only if entire chain does
151 - - commit-graph: implement generation data chunk
152 - - commit-graph: implement corrected commit date
153 - - commit-graph: add a slab to store topological levels
154 - - commit-graph: return 64-bit generation number
155 - - commit-graph: consolidate fill_commit_graph_info
156 - - revision: parse parent in indegree_walk_step()
157 - - commit-graph: fix regression when computing Bloom filters
158 -
159 - The commit-graph learned to use corrected commit dates instead of
160 - the generation number to help topological revision traversal.
161 -
162 - Getting there.
163 - cf. <85y2jiqq3c.fsf@gmail.com>
164 - cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
165 - cf. <20201103053629.GA13228@Abhishek-Arch>
166 -
167 -
271 * mt/grep-sparse-checkout (2020-12-06) 10 commits
272 - t7817: do not depend on any specific default branch name
273 - config: add setting to ignore sparsity patterns in some cmds
@@ -216,6 +319,8 @@ Release tarballs are available at:
319 introduce a class that is separate from symlinked .gitmodules that
320 probably is with potential consequences that is more/less grave?
321
322 + Will eject out of 'next' when rewinding the branch.
323 +
324
325 * sm/curl-retry (2020-10-13) 3 commits
326 - http: automatically retry some requests
@@ -310,6 +415,55 @@ Release tarballs are available at:
415 --------------------------------------------------
416 [Cooking]
417
418 +* ak/corrected-commit-date (2021-01-04) 11 commits
419 + - doc: add corrected commit date info
420 + - commit-reach: use corrected commit dates in paint_down_to_common()
421 + - commit-graph: use generation v2 only if entire chain does
422 + - commit-graph: implement generation data chunk
423 + - commit-graph: implement corrected commit date
424 + - commit-graph: return 64-bit generation number
425 + - commit-graph: add a slab to store topological levels
426 + - t6600-test-reach: generalize *_three_modes
427 + - commit-graph: consolidate fill_commit_graph_info
428 + - revision: parse parent in indegree_walk_step()
429 + - commit-graph: fix regression when computing Bloom filters
430 +
431 + The commit-graph learned to use corrected commit dates instead of
432 + the generation number to help topological revision traversal.
433 +
434 + Getting there.
435 +
436 +
437 +* es/perf-export-fix (2020-12-22) 1 commit
438 + (merged to 'next' on 2020-12-22 at d06b0379d9)
439 + + t/perf: avoid unnecessary test_export() recursion
440 +
441 + Tweak unneeded recursion from a test framework helper function.
442 +
443 + Will merge to 'master'.
444 +
445 +
446 +* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
447 + - git-p4: fix syncing file types with pattern
448 +
449 + Text encoding fix for "git p4".
450 +
451 +
452 +* fc/mergetool-automerge (2021-01-06) 5 commits
453 + . mergetool: add automerge_enabled tool-specific override function
454 + . mergetool: break setup_tool out into separate initialization function
455 + . mergetool: add per-tool support for the autoMerge flag
456 + . mergetool: alphabetize the mergetool config docs
457 + . mergetool: add automerge configuration
458 +
459 + "git mergetool" feeds three versions (base, local and remote) of
460 + a conflicted path unmodified. The command learned to optionally
461 + prepare these files with unconflicted parts already resolved.
462 +
463 + Breaks tests on macOS.
464 + cf. https://github.com/git/git/runs/1659807735?check_suite_focus=true#step:4:1641
465 +
466 +
467 * ew/decline-core-abbrev (2020-12-23) 1 commit
468 - core.abbrev=no disables abbreviations
469
@@ -326,7 +480,7 @@ Release tarballs are available at:
480 "git worktree repair" learned to deal with the case where both the
481 repository and the worktree moved.
482
329 - Will cook in 'next'.
483 + Will merge to 'master'.
484
485
486 * fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
@@ -336,7 +490,7 @@ Release tarballs are available at:
490 A 3-year old test that was not testing anything useful has been
491 corrected.
492
339 - Will cook in 'next'.
493 + Will merge to 'master'.
494
495
496 * mr/bisect-in-c-4 (2020-12-21) 7 commits
@@ -363,13 +517,12 @@ Release tarballs are available at:
517
518
519 * fc/bash-completion-post-2.29 (2020-12-23) 4 commits
366 - . completion: bash: add correct suffix in variables
367 - . completion: bash: fix for multiple dash commands
368 - . completion: bash: fix for suboptions with value
369 - . completion: bash: fix prefix detection in branch.*
520 + - completion: bash: add correct suffix in variables
521 + - completion: bash: fix for multiple dash commands
522 + - completion: bash: fix for suboptions with value
523 + - completion: bash: fix prefix detection in branch.*
524
525 Seems to break tests on Windows
372 - cf. https://github.com/git/git/runs/1597682180#step:5:35614
526
527
528 * jc/config-pretend-gitdir (2020-12-15) 1 commit
@@ -392,13 +545,13 @@ Release tarballs are available at:
545 + merge-ort: make clear_internal_opts() aware of partial clearing
546 + merge-ort: copy a few small helper functions from merge-recursive.c
547 + commit: move reverse_commit_list() from merge-recursive
395 - (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
548 + (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/ort-conflict-handling.)
549
550 The ORT merge strategy learned to synthesize virtual ancestor tree
551 by recursively merging multiple merge bases together, just like the
552 recursive backend has done for years.
553
401 - Will cook in 'next'.
554 + Will merge to 'master'.
555
556
557 * mt/parallel-checkout-part-1 (2020-12-16) 9 commits
@@ -429,13 +582,12 @@ Release tarballs are available at:
582 - merge-ort: implement detect_regular_renames()
583 - merge-ort: add initial outline for basic rename detection
584 - merge-ort: add basic data structures for handling renames
432 - (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
585 + (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive and en/ort-conflict-handling.)
586
587 Rename detection is added to the "ORT" merge strategy.
588
589
437 -* ps/config-env-pairs (2020-12-23) 9 commits
438 - - SQUASH???
590 +* ps/config-env-pairs (2021-01-06) 8 commits
591 - config: allow specifying config entries via envvar pairs
592 - environment: make `getenv_safe()` a public function
593 - config: parse more robust format in GIT_CONFIG_PARAMETERS
@@ -449,6 +601,8 @@ Release tarballs are available at:
601 via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
602 encodes variable/value pairs to make it more robust.
603
604 + Ready for 'next'?
605 +
606
607 * bc/hashed-mailmap (2020-12-12) 1 commit
608 - mailmap: support hashed entries in mailmaps
@@ -531,11 +685,11 @@ Release tarballs are available at:
685 + merge-ort: add some high-level algorithm structure
686 + merge-ort: setup basic internal data structures
687 + Merge branch 'en/strmap' into en/merge-ort-impl
534 - (this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
688 + (this branch is used by en/merge-ort-2, en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling.)
689
690 The merge backend "done right" starts to emerge.
691
538 - Will cook in 'next'.
692 + Will merge to 'master'.
693
694
695 * es/config-hooks (2020-12-21) 34 commits
@@ -600,8 +754,8 @@ Release tarballs are available at:
754 The "reftable" backend for the refs API.
755
756
603 -* ab/mktag (2020-12-22) 20 commits
604 - - mktag: add a --no-strict option
757 +* ab/mktag (2021-01-06) 23 commits
758 + - mktag: add a --[no-]strict option
759 - mktag: mark strings for translation
760 - mktag: convert to parse-options
761 - mktag: allow omitting the header/body \n separator
@@ -611,12 +765,15 @@ Release tarballs are available at:
765 - mktag: use puts(str) instead of printf("%s\n", str)
766 - mktag: remove redundant braces in one-line body "if"
767 - mktag: use default strbuf_read() hint
768 + - mktag tests: test verify_object() with replaced objects
769 + - mktag tests: improve verify_object() test coverage
770 - mktag tests: test "hash-object" compatibility
771 - mktag tests: stress test whitespace handling
772 + - mktag tests: run "fsck" after creating "mytag"
773 - mktag tests: don't create "mytag" twice
617 - - mktag tests: don't pipe to stderr needlessly
618 - - mktag tests: improve verify_object() test coverage
774 + - mktag tests: don't redirect stderr to a file needlessly
775 - mktag tests: remove needless SHA-1 hardcoding
776 + - mktag tests: use "test_commit" helper
777 - mktag tests: don't needlessly use a subshell
778 - mktag doc: update to explain why to use this
779 - mktag doc: grammar fix, when exists -> when it exists
@@ -626,7 +783,7 @@ Release tarballs are available at:
783 a tag object---it has been updated to share the logic with "git
784 fsck".
785
629 - cf. <20201223013606.7972-1-avarab@gmail.com>
786 + Will merge to 'next'.
787
788
789 * ab/trailers-extra-format (2020-12-09) 5 commits
@@ -640,11 +797,11 @@ Release tarballs are available at:
797 The "--format=%(trailers)" mechanism gets enhanced to make it
798 easier to design output for machine consumption.
799
643 - Will cook in 'next'.
800 + Will merge to 'master'.
801
802
646 -* en/diffcore-rename (2020-12-14) 9 commits
647 - - diffcore-rename: remove unneccessary duplicate entry checks
803 +* en/diffcore-rename (2021-01-04) 9 commits
804 + - diffcore-rename: remove unnecessary duplicate entry checks
805 - diffcore-rename: accelerate rename_dst setup
806 - diffcore-rename: simplify and accelerate register_rename_src()
807 - t4058: explore duplicate tree entry handling in a bit more detail
@@ -666,11 +823,11 @@ Release tarballs are available at:
823 + merge-ort: add a path_conflict field to merge_options_internal
824 + merge-ort: add a clear_internal_opts helper
825 + merge-ort: add a few includes
669 - (this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
826 + (this branch is used by en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling; uses en/merge-ort-impl.)
827
828 More "ORT" merge strategy.
829
673 - Will cook in 'next'.
830 + Will merge to 'master'.
831
832
833 * fc/pull-merge-rebase (2020-12-15) 5 commits
@@ -689,7 +846,7 @@ Release tarballs are available at:
846 no reason to stop or force the user to choose between rebase or
847 merge if the history fast-forwards.
848
692 - Will cook in 'next'.
849 + Will merge to 'master'.
850
851
852 * pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
@@ -698,7 +855,7 @@ Release tarballs are available at:
855
856 "git fetch --recurse-submodules" fix (second attempt).
857
701 - Will cook in 'next'.
858 + Will merge to 'master'.
859
860
861 * en/stash-apply-sparse-checkout (2020-12-01) 3 commits
@@ -741,7 +898,7 @@ Release tarballs are available at:
898
899 Various improvements to the codepath that writes out pack bitmaps.
900
744 - Will cook in 'next'.
901 + Will merge to 'master'.
902
903
904 * js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
@@ -778,10 +935,10 @@ Release tarballs are available at:
935 Prepare tests not to be affected by the name of the default branch
936 "git init" creates.
937
938 + Will merge to 'next'.
939 +
940
782 -* ds/maintenance-part-4 (2020-12-09) 6 commits
783 - - t7900: make macOS-specific test work on Windows
784 - - t7900: fix test failures when invoked individually via --run
941 +* ds/maintenance-part-4 (2021-01-05) 4 commits
942 - maintenance: use Windows scheduled tasks
943 - maintenance: use launchctl on macOS
944 - maintenance: include 'cron' details in docs
@@ -791,6 +948,8 @@ Release tarballs are available at:
948 maintenance tasks to support platforms whose native scheduling
949 methods are not 'cron'.
950
951 + Will merge to 'next'.
952 +
953
954 * sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
955 - diff: do not show submodule with untracked files as "-dirty"
@@ -800,27 +959,3 @@ Release tarballs are available at:
959 that the "-dirty" indicator would align with "git describe --dirty",
960 which does not consider having untracked files in the working tree
961 as source of dirtiness. The inconsistency has been fixed.
803 -
804 ---------------------------------------------------
805 -[Discarded]
806 -
807 -* dr/push-remoteref-fix (2020-04-23) 1 commit
808 - . remote.c: fix handling of %(push:remoteref)
809 -
810 - The "%(push:remoteref)" placeholder in the "--format=" argument of
811 - "git format-patch" (and friends) only showed what got explicitly
812 - configured, not what ref at the receiving end would be updated when
813 - "git push" was used, as it ignored the default behaviour (e.g. update
814 - the same ref as the source).
815 -
816 - Discard for now.
817 - cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
818 - cf. <20200911214358.acl3hy2e763begoo@feanor>
819 -
820 -
821 -* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
822 - . config: store "git -c" variables using more robust format
823 - . config: parse more robust format in GIT_CONFIG_PARAMETERS
824 - . quote: make sq_dequote_step() a public function
825 -
826 - Absorbed by the ps/config-env-pairs topic.