What's cooking (2020/12 #03)
... as of 2.30-rc1
Junio C Hamano committed
Dec 18, 2020 at 17:23 UTC
730f2a8a60960c30a79e00ebe034836f60befbf0
1 file changed
+266
-249
whats-cooking.txt
+266
-249
@@ -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, #02; Mon, 14)
4
-X-master-at: 1c52ecf4ba0f4f7af72775695fee653f50737c71
5
-X-next-at: 06539567b223ae3441fad75ce47b72db03708628
3
+Subject: What's cooking in git.git (Dec 2020, #03; Fri, 18)
4
+X-master-at: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
5
+X-next-at: 5298b911bdfa173511fab94a90a4302a2f1965b3
6
7
-What's cooking in git.git (Dec 2020, #02; Mon, 14)
7
+What's cooking in git.git (Dec 2020, #03; Fri, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,10 +12,12 @@ 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
-A preview release 2.30-rc0 has been tagged; there are too many
15
+A release candidate 2.30-rc1 has been tagged; there are too many
16
topics in flight, sadly many of which haven't been adequately
17
-reviewed. I wish we had half the number of topics that had been
18
-reviewed twice as better, but such is life.
17
+reviewed. I think there are a couple of topics left in 'next' that
18
+are obvious candidates for the final, but it would be lovely if we
19
+can figure out how to get topics in 'seen' that haven't got enough
20
+love unstuck.
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -48,116 +50,101 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
51
-* ae/doc-reproducible-html (2020-12-02) 1 commit
52
- (merged to 'next' on 2020-12-08 at 263232f371)
53
- + doc: make HTML manual reproducible
53
+* ab/unreachable-break (2020-12-15) 1 commit
54
+ (merged to 'next' on 2020-12-17 at 3eab6be401)
55
+ + style: do not "break" in switch() after "return"
56
55
- Newer versions of xsltproc can assign IDs in HTML documents it
56
- generates in a consistent manner. Use the feature to help format
57
- HTML version of the user manual reproducibly.
57
+ Code clean-up.
58
59
60
-* da/vs-build-iconv-fix (2020-12-04) 1 commit
61
- (merged to 'next' on 2020-12-08 at 4c6c5054a3)
62
- + ci(vs-build): stop passing the iconv library location explicitly
60
+* dd/doc-p4-requirements-update (2020-12-14) 1 commit
61
+ (merged to 'next' on 2020-12-17 at 59649dd9a8)
62
+ + doc: mention Python 3.x supports
63
64
- Build update.
64
+ Doc update.
65
66
67
-* dd/help-autocorrect-never (2020-11-25) 1 commit
68
- (merged to 'next' on 2020-12-08 at f1531ab641)
69
- + help.c: help.autocorrect=never means "do not compute suggestions"
67
+* es/perf-export-fix (2020-12-16) 1 commit
68
+ (merged to 'next' on 2020-12-17 at 57489420ed)
69
+ + t/perf: fix test_export() failure with BSD `sed`
70
71
- "git $cmd $args", when $cmd is not a recognised subcommand, by
72
- default tries to see if $cmd is a typo of an existing subcommand
73
- and optionally executes the corrected command if there is only one
74
- possibility, depending on the setting of help.autocorrect; the
75
- users can now disable the whole thing, including the cycles spent
76
- to find a likely typo, by setting the configuration variable to
77
- 'never'.
71
+ Dev-support fix for BSD.
72
73
80
-* fc/atmark-in-refspec (2020-11-30) 3 commits
81
- (merged to 'next' on 2020-12-08 at bfded23c1c)
82
- + refspec: make @ a synonym of HEAD
83
- + tests: push: trivial cleanup
84
- + tests: push: improve cleanup of HEAD tests
74
+* jb/midx-doc-update (2020-12-14) 1 commit
75
+ (merged to 'next' on 2020-12-14 at 880b50e89d)
76
+ + docs: multi-pack-index: remove note about future 'verify' work
77
86
- "@" sometimes worked (e.g. "git push origin @:there") as a part of
87
- a refspec element, but "git push origin @" did not work, which has
88
- been corrected.
78
+ Doc update.
79
80
91
-* jk/check-config-parsing-error-in-upload-pack (2020-12-03) 1 commit
92
- (merged to 'next' on 2020-12-08 at b618c7d956)
93
- + upload-pack: propagate return value from object filter config callback
81
+* jc/compat-util-setitimer-fix (2020-12-15) 1 commit
82
+ (merged to 'next' on 2020-12-17 at 99a9af5066)
83
+ + compat-util: pretend that stub setitimer() always succeeds
84
95
- Tighten error checking in the codepath that responds to "git fetch".
85
+ Fix a recent bug in a rarely used replacement code.
86
87
98
-* jk/multi-line-indent-style-fix (2020-12-03) 1 commit
99
- (merged to 'next' on 2020-12-08 at e6d1026437)
100
- + style: indent multiline "if" conditions to align
88
+* jc/diff-I-status-fix (2020-12-16) 1 commit
89
+ (merged to 'next' on 2020-12-17 at d7cd43984a)
90
+ + diff: correct interaction between --exit-code and -I<pattern>
91
102
- Style fix.
92
+ "git diff -I<pattern> -exit-code" should exit with 0 status when
93
+ all the changes match the ignored pattern, but it didn't.
94
95
105
-* js/cmake-extra-built-ins-fix (2020-12-04) 1 commit
106
- (merged to 'next' on 2020-12-08 at f29945cb35)
107
- + cmake: determine list of extra built-ins dynamically
96
+* jc/strmap-remove-typefix (2020-12-15) 1 commit
97
+ (merged to 'next' on 2020-12-17 at e94fef7216)
98
+ + strmap: make callers of strmap_remove() to call it in void context
99
109
- VSbuild fix.
100
+ C-std compliance fix.
101
102
112
-* js/t5526-with-no-particular-primary-branch-name (2020-12-04) 2 commits
113
- (merged to 'next' on 2020-12-08 at b16af9417c)
114
- + t5526: drop the prereq expecting the default branch name `main`
115
- + t5526: avoid depending on a specific default branch name
103
+* jh/index-v2-doc-on-fsmn (2020-12-14) 1 commit
104
+ (merged to 'next' on 2020-12-14 at bd3507ccc8)
105
+ + index-format.txt: document v2 format of file system monitor extension
106
117
- Test update.
107
+ Doc update.
108
109
120
-* so/glossary-branch-is-not-necessarily-active (2020-12-02) 1 commit
121
- (merged to 'next' on 2020-12-08 at 01805f8ab6)
122
- + glossary: improve "branch" definition
110
+* jk/oid-array-cleanup (2020-12-07) 9 commits
111
+ (merged to 'next' on 2020-12-14 at 362f6f2618)
112
+ + commit-graph: use size_t for array allocation and indexing
113
+ + commit-graph: replace packed_oid_list with oid_array
114
+ + commit-graph: drop count_distinct_commits() function
115
+ + oid-array: provide a for-loop iterator
116
+ + oid-array: make sort function public
117
+ + cache.h: move hash/oid functions to hash.h
118
+ + t0064: make duplicate tests more robust
119
+ + t0064: drop sha1 mention from filename
120
+ + oid-array.h: drop sha1 mention from header guard
121
124
- The glossary described a branch as an "active" line of development,
125
- which is misleading---a stale and non-moving branch is still a
126
- branch.
122
+ Code clean-up.
123
128
---------------------------------------------------
129
-[New Topics]
124
131
-* en/merge-ort-3 (2020-12-14) 11 commits
132
- - merge-ort: add implementation of type-changed rename handling
133
- - merge-ort: add implementation of normal rename handling
134
- - merge-ort: add implementation of rename/delete conflicts
135
- - merge-ort: add implementation of rename collisions
136
- - merge-ort: add implementation of both sides renaming differently
137
- - merge-ort: add implementation of both sides renaming identically
138
- - merge-ort: add basic outline for process_renames()
139
- - merge-ort: implement compare_pairs() and collect_renames()
140
- - merge-ort: implement detect_regular_renames()
141
- - merge-ort: add initial outline for basic rename detection
142
- - merge-ort: add basic data structures for handling renames
143
- (this branch uses en/merge-ort-2 and en/merge-ort-impl.)
125
+* js/init-defaultbranch-advice (2020-12-13) 4 commits
126
+ (merged to 'next' on 2020-12-15 at bcca948854)
127
+ + init: provide useful advice about init.defaultBranch
128
+ + get_default_branch_name(): prepare for showing some advice
129
+ + branch -m: allow renaming a yet-unborn branch
130
+ + init: document `init.defaultBranch` better
131
145
- Rename detection is added to the "ORT" merge strategy.
132
+ Our users are going to be trained to prepare for future change of
133
+ init.defaultBranch configuration variable.
134
135
148
-* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
149
- - config: store "git -c" variables using more robust format
150
- - config: parse more robust format in GIT_CONFIG_PARAMETERS
151
- - quote: make sq_dequote_step() a public function
152
- (this branch uses ps/config-env-pairs.)
136
+* js/t6300-hardcode-main (2020-12-07) 1 commit
137
+ (merged to 'next' on 2020-12-14 at 4eed7c6a8b)
138
+ + t6300: avoid using the default name of the initial branch
139
154
- The quoting rules used to pass "git -c var=val" configuration
155
- across processes have been updated in a backward compatible way, so
156
- that the value read from an environment variable can contain an
157
- equal sign when using the "git --config-env var=env" feature.
140
+ Test update.
141
159
- We may want to make this just a part of the ps/config-env-pairs
160
- topic with a bit of patch shuffling.
142
+
143
+* js/t7064-master-to-initial (2020-12-08) 1 commit
144
+ (merged to 'next' on 2020-12-14 at b75529f792)
145
+ + t7064: avoid relying on a specific default branch name
146
+
147
+ Test update.
148
149
150
* js/t7900-protect-pwd-in-config-get (2020-12-09) 1 commit
@@ -166,34 +153,91 @@ Release tarballs are available at:
153
154
Hotfix for test breakage.
155
169
- Will merge to 'master'.
156
157
+* rb/nonstop-config-mak-uname-update (2020-12-16) 1 commit
158
+ (merged to 'next' on 2020-12-17 at 456a1bc21e)
159
+ + config.mak.uname: remove old NonStop compatibility settings
160
172
-* bc/hashed-mailmap (2020-12-12) 1 commit
173
- - mailmap: support hashed entries in mailmaps
161
+ Build update.
162
175
- The mailmap database learned to take hashed value as the original
176
- side of mapping.
163
178
- Expecting a reroll.
164
+* rj/make-clean (2020-12-08) 5 commits
165
+ (merged to 'next' on 2020-12-14 at 767b1398d7)
166
+ + Makefile: don't use a versioned temp distribution directory
167
+ + Makefile: don't try to clean old debian build product
168
+ + gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
169
+ + Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
170
+ + Documentation/Makefile: conditionally include doc.dep
171
172
+ Build optimization.
173
181
-* jb/midx-doc-update (2020-12-14) 1 commit
182
- (merged to 'next' on 2020-12-14 at 880b50e89d)
183
- + docs: multi-pack-index: remove note about future 'verify' work
174
185
- Doc update.
175
+* tb/partial-clone-filters-fix (2020-12-03) 2 commits
176
+ (merged to 'next' on 2020-12-14 at d44e5942da)
177
+ + upload-pack.c: don't free allowed_filters util pointers
178
+ + builtin/clone.c: don't ignore transport_fetch_refs() errors
179
+
180
+ Fix potential server side resource deallocation issues when
181
+ responding to a partial clone request.
182
187
- Will merge to 'next' and to 'master'.
183
+--------------------------------------------------
184
+[New Topics]
185
186
+* jc/config-pretend-gitdir (2020-12-15) 1 commit
187
+ - config: --pretend-git-dir for includeIf:gitdir
188
190
-* jh/index-v2-doc-on-fsmn (2020-12-14) 1 commit
191
- (merged to 'next' on 2020-12-14 at bd3507ccc8)
192
- + index-format.txt: document v2 format of file system monitor extension
189
+ WIP
190
194
- Doc update.
191
196
- Will merge to 'next' and to 'master'.
192
+* jc/deprecate-pack-redundant (2020-12-15) 1 commit
193
+ - pack-redundant: gauge the usage before proposing its removal
194
+
195
+ Warn loudly when the "pack-redundant" command, which has been left
196
+ stale with almost unusable performance issues, gets used, as we no
197
+ longer want to recommend its use (instead just "repack -d" instead).
198
+
199
+
200
+* en/merge-ort-recursive (2020-12-16) 4 commits
201
+ - merge-ort: implement merge_incore_recursive()
202
+ - merge-ort: make clear_internal_opts() aware of partial clearing
203
+ - merge-ort: copy a few small helper functions from merge-recursive.c
204
+ - commit: move reverse_commit_list() from merge-recursive
205
+ (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
206
+
207
+ The ORT merge strategy learned to synthesize virtual ancestor tree
208
+ by recursively merging multiple merge bases together, just like the
209
+ recursive backend has done for years.
210
+
211
+ Will merge to 'next'.
212
+
213
+
214
+* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
215
+ (merged to 'next' on 2020-12-18 at d15a382d4d)
216
+ + tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
217
+ + t9902: use `main` as initial branch name
218
+ + t6302: use `main` as initial branch name
219
+ + t5703: use `main` as initial branch name
220
+ + t5510: use `main` as initial branch name
221
+ + t5505: finalize transitioning to using the branch name `main`
222
+ + t3205: finalize transitioning to using the branch name `main`
223
+ + t3203: complete the transition to using the branch name `main`
224
+ + t3201: finalize transitioning to using the branch name `main`
225
+ + t3200: finish transitioning to the initial branch name `main`
226
+ + t1400: use `main` as initial branch name
227
+
228
+ Test coverage fix.
229
+
230
+ Will merge to 'master'.
231
+
232
+
233
+* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
234
+ (merged to 'next' on 2020-12-18 at b819311529)
235
+ + pack-redundant: fix crash when one packfile in repo
236
+
237
+ "git pack-redandant" when there is only one packfile used to crash,
238
+ which has been corrected.
239
+
240
+ Will merge to 'master'.
241
242
--------------------------------------------------
243
[Stalled]
@@ -363,42 +407,16 @@ Release tarballs are available at:
407
--------------------------------------------------
408
[Needs Review]
409
366
-* ss/submodule-add-in-c (2020-10-07) 3 commits
367
- . t7400: add test to check 'submodule add' for tracked paths
368
- . submodule: port submodule subcommand 'add' from shell to C
369
- . dir: change the scope of function 'directory_exists_in_index()'
410
+* ss/submodule-add-in-c (2020-12-15) 3 commits
411
+ - t7400: add test to check 'submodule add' for tracked paths
412
+ - submodule: port submodule subcommand 'add' from shell to C
413
+ - dir: change the scope of function 'directory_exists_in_index()'
414
415
"git submodule add" being rewritten in C.
416
417
Needs review.
418
419
376
-* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
377
- - ci: run test round with parallel-checkout enabled
378
- - parallel-checkout: add tests related to .gitattributes
379
- - parallel-checkout: add tests related to clone collisions
380
- - parallel-checkout: add tests for basic operations
381
- - checkout-index: add parallel checkout support
382
- - builtin/checkout.c: complete parallel checkout support
383
- - make_transient_cache_entry(): optionally alloc from mem_pool
384
- - parallel-checkout: support progress displaying
385
- - parallel-checkout: make it truly parallel
386
- - unpack-trees: add basic support for parallel checkout
387
- - entry: add checkout_entry_ca() which takes preloaded conv_attrs
388
- - entry: move conv_attrs lookup up to checkout_entry()
389
- - entry: extract cache_entry update from write_entry()
390
- - entry: make fstat_output() and read_blob_entry() public
391
- - entry: extract a header file for entry.c functions
392
- - convert: add conv_attrs classification
393
- - convert: add get_stream_filter_ca() variant
394
- - convert: add [async_]convert_to_working_tree_ca() variants
395
- - convert: make convert_attrs() and convert structs public
396
-
397
- Parallel checkout.
398
-
399
- Needs review.
400
-
401
-
420
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
421
- completion: bash: shuffle __gitcomp functions
422
- completion: bash: cleanup __gitcomp* invocations
@@ -453,12 +471,88 @@ Release tarballs are available at:
471
--------------------------------------------------
472
[Cooking]
473
456
-* so/log-diff-merge (2020-11-09) 27 commits
474
+* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
475
+ - entry: add checkout_entry_ca() taking preloaded conv_attrs
476
+ - entry: move conv_attrs lookup up to checkout_entry()
477
+ - entry: extract update_ce_after_write() from write_entry()
478
+ - entry: make fstat_output() and read_blob_entry() public
479
+ - entry: extract a header file for entry.c functions
480
+ - convert: add classification for conv_attrs struct
481
+ - convert: add get_stream_filter_ca() variant
482
+ - convert: add [async_]convert_to_working_tree_ca() variants
483
+ - convert: make convert_attrs() and convert structs public
484
+
485
+ Parallel checkout.
486
+
487
+ Looking good.
488
+
489
+
490
+* en/merge-ort-3 (2020-12-15) 11 commits
491
+ - merge-ort: add implementation of type-changed rename handling
492
+ - merge-ort: add implementation of normal rename handling
493
+ - merge-ort: add implementation of rename collisions
494
+ - merge-ort: add implementation of rename/delete conflicts
495
+ - merge-ort: add implementation of both sides renaming differently
496
+ - merge-ort: add implementation of both sides renaming identically
497
+ - merge-ort: add basic outline for process_renames()
498
+ - merge-ort: implement compare_pairs() and collect_renames()
499
+ - merge-ort: implement detect_regular_renames()
500
+ - merge-ort: add initial outline for basic rename detection
501
+ - merge-ort: add basic data structures for handling renames
502
+ (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
503
+
504
+ Rename detection is added to the "ORT" merge strategy.
505
+
506
+
507
+* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
508
+ - config: store "git -c" variables using more robust format
509
+ - config: parse more robust format in GIT_CONFIG_PARAMETERS
510
+ - quote: make sq_dequote_step() a public function
511
+ (this branch uses ps/config-env-pairs.)
512
+
513
+ The quoting rules used to pass "git -c var=val" configuration
514
+ across processes have been updated in a backward compatible way, so
515
+ that the value read from an environment variable can contain an
516
+ equal sign when using the "git --config-env var=env" feature.
517
+
518
+ We may want to make this just a middle part of the
519
+ ps/config-env-pairs topic with a bit of patch shuffling.
520
+
521
+
522
+* ps/config-env-pairs (2020-12-09) 6 commits
523
+ - config: allow specifying config entries via envvar pairs
524
+ - config: refactor parsing of GIT_CONFIG_PARAMETERS
525
+ - config: extract function to parse config pairs
526
+ - environment: make `getenv_safe()` non-static
527
+ - config: add new way to pass config via `--config-env`
528
+ - git: add `--super-prefix` to usage string
529
+ (this branch is used by jk/disambiguate-equal-in-config-param.)
530
+
531
+ Introduce two new ways to feed configuration variable-value pairs
532
+ via environment variables.
533
+
534
+
535
+* bc/hashed-mailmap (2020-12-12) 1 commit
536
+ - mailmap: support hashed entries in mailmaps
537
+
538
+ The mailmap database learned to take hashed value as the original
539
+ side of mapping.
540
+
541
+ Expecting a reroll.
542
+
543
+
544
+* so/log-diff-merge (2020-12-16) 33 commits
545
+ - t4013: add tests for --diff-merges=first-parent
546
- doc/git-show: include --diff-merges description
458
- - doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
547
+ - doc/rev-list-options: document --first-parent changes merges format
548
- doc/diff-generate-patch: mention new --diff-merges option
549
- doc/git-log: describe new --diff-merges options
461
- - t4013: add test for --diff-merges=first-parent
550
+ - diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
551
+ - diff-merges: add old mnemonic counterparts to --diff-merges
552
+ - diff-merges: let new options enable diff without -p
553
+ - diff-merges: do not imply -p for new options
554
+ - diff-merges: handle imply -p on -c/--cc logic for log.c
555
+ - diff-merges: fix style of functions definitions
556
- diff-merges: implement new values for --diff-merges
557
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
558
- diff-merges: refactor opt settings into separate functions
@@ -484,7 +578,7 @@ Release tarballs are available at:
578
579
"git log" learned a new "--diff-merges=<how>" option.
580
487
- Expecting a reroll.
581
+ Rerolled.
582
583
584
* bc/rev-parse-path-format (2020-12-12) 2 commits
@@ -517,10 +611,12 @@ Release tarballs are available at:
611
- merge-ort: add some high-level algorithm structure
612
- merge-ort: setup basic internal data structures
613
- Merge branch 'en/strmap' into en/merge-ort-impl
520
- (this branch is used by en/merge-ort-2 and en/merge-ort-3.)
614
+ (this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
615
616
The merge backend "done right" starts to emerge.
617
618
+ Will merge to 'next'.
619
+
620
621
* es/config-hooks (2020-12-07) 34 commits
622
. run-command: stop thinking about hooks
@@ -583,6 +679,9 @@ Release tarballs are available at:
679
680
The "reftable" backend for the refs API.
681
682
+ Ejected for now, as it has been breaking the tip of 'seen' for too
683
+ long.
684
+
685
686
* ab/mktag (2020-12-09) 11 commits
687
- SQUASH???
@@ -640,15 +739,14 @@ Release tarballs are available at:
739
- merge-ort: add a path_conflict field to merge_options_internal
740
- merge-ort: add a clear_internal_opts helper
741
- merge-ort: add a few includes
643
- (this branch is used by en/merge-ort-3; uses en/merge-ort-impl.)
742
+ (this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
743
744
More "ORT" merge strategy.
745
647
- Looking good.
648
- cf. <2ea0aab8-934f-3eaa-e3d0-9ae35a278748@gmail.com>
746
+ Will merge to 'next'.
747
748
651
-* fc/pull-merge-rebase (2020-12-14) 5 commits
749
+* fc/pull-merge-rebase (2020-12-15) 5 commits
750
- pull: display default warning only when non-ff
751
- pull: correct condition to trigger non-ff advice
752
- pull: get rid of unnecessary global variable
@@ -664,41 +762,6 @@ Release tarballs are available at:
762
merge if the history fast-forwards.
763
764
667
-* jk/oid-array-cleanup (2020-12-07) 9 commits
668
- (merged to 'next' on 2020-12-14 at 362f6f2618)
669
- + commit-graph: use size_t for array allocation and indexing
670
- + commit-graph: replace packed_oid_list with oid_array
671
- + commit-graph: drop count_distinct_commits() function
672
- + oid-array: provide a for-loop iterator
673
- + oid-array: make sort function public
674
- + cache.h: move hash/oid functions to hash.h
675
- + t0064: make duplicate tests more robust
676
- + t0064: drop sha1 mention from filename
677
- + oid-array.h: drop sha1 mention from header guard
678
-
679
- Code clean-up.
680
-
681
- Will merge to 'master'.
682
-
683
-
684
-* js/t6300-hardcode-main (2020-12-07) 1 commit
685
- (merged to 'next' on 2020-12-14 at 4eed7c6a8b)
686
- + t6300: avoid using the default name of the initial branch
687
-
688
- Test update.
689
-
690
- Will merge to 'master'.
691
-
692
-
693
-* js/t7064-master-to-initial (2020-12-08) 1 commit
694
- (merged to 'next' on 2020-12-14 at b75529f792)
695
- + t7064: avoid relying on a specific default branch name
696
-
697
- Test update.
698
-
699
- Will merge to 'master'.
700
-
701
-
765
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
766
(merged to 'next' on 2020-12-14 at ccc01a5f66)
767
+ submodules: fix of regression on fetching of non-init subsub-repo
@@ -708,30 +771,6 @@ Release tarballs are available at:
771
Will cook in 'next'.
772
773
711
-* rj/make-clean (2020-12-08) 5 commits
712
- (merged to 'next' on 2020-12-14 at 767b1398d7)
713
- + Makefile: don't use a versioned temp distribution directory
714
- + Makefile: don't try to clean old debian build product
715
- + gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
716
- + Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
717
- + Documentation/Makefile: conditionally include doc.dep
718
-
719
- Build optimization.
720
-
721
- Will merge to 'master'.
722
-
723
-
724
-* tb/partial-clone-filters-fix (2020-12-03) 2 commits
725
- (merged to 'next' on 2020-12-14 at d44e5942da)
726
- + upload-pack.c: don't free allowed_filters util pointers
727
- + builtin/clone.c: don't ignore transport_fetch_refs() errors
728
-
729
- Fix potential server side resource deallocation issues when
730
- responding to a partial clone request.
731
-
732
- Will merge to 'master'.
733
-
734
-
774
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
775
- stash: fix stash application in sparse-checkouts
776
- stash: remove unnecessary process forking
@@ -741,58 +780,36 @@ Release tarballs are available at:
780
tree.
781
782
744
-* js/init-defaultbranch-advice (2020-12-13) 4 commits
745
- - init: provide useful advice about init.defaultBranch
746
- - get_default_branch_name(): prepare for showing some advice
747
- - branch -m: allow renaming a yet-unborn branch
748
- - init: document `init.defaultBranch` better
749
-
750
- Our users are going to be trained to prepare for future change of
751
- init.defaultBranch configuration variable.
752
-
753
-
754
-* ps/config-env-pairs (2020-12-09) 6 commits
755
- - config: allow specifying config entries via envvar pairs
756
- - config: refactor parsing of GIT_CONFIG_PARAMETERS
757
- - config: extract function to parse config pairs
758
- - environment: make `getenv_safe()` non-static
759
- - config: add new way to pass config via `--config-env`
760
- - git: add `--super-prefix` to usage string
761
- (this branch is used by jk/disambiguate-equal-in-config-param.)
762
-
763
- Introduce two new ways to feed configuration variable-value pairs
764
- via environment variables.
765
-
766
-
783
* tb/pack-bitmap (2020-12-08) 24 commits
768
- - pack-bitmap-write: better reuse bitmaps
769
- - pack-bitmap-write: relax unique revwalk condition
770
- - pack-bitmap-write: use existing bitmaps
771
- - pack-bitmap: factor out 'add_commit_to_bitmap()'
772
- - pack-bitmap: factor out 'bitmap_for_commit()'
773
- - pack-bitmap-write: ignore BITMAP_FLAG_REUSE
774
- - pack-bitmap-write: build fewer intermediate bitmaps
775
- - pack-bitmap.c: check reads more aggressively when loading
776
- - pack-bitmap-write: rename children to reverse_edges
777
- - t5310: add branch-based checks
778
- - commit: implement commit_list_contains()
779
- - bitmap: implement bitmap_is_subset()
780
- - pack-bitmap-write: fill bitmap with commit history
781
- - pack-bitmap-write: pass ownership of intermediate bitmaps
782
- - pack-bitmap-write: reimplement bitmap writing
783
- - ewah: add bitmap_dup() function
784
- - ewah: implement bitmap_or()
785
- - ewah: make bitmap growth less aggressive
786
- - ewah: factor out bitmap growth
787
- - rev-list: die when --test-bitmap detects a mismatch
788
- - t5310: drop size of truncated ewah bitmap
789
- - pack-bitmap: bounds-check size of cache extension
790
- - pack-bitmap: fix header size check
791
- - ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
792
-
793
- Various improvement to the codepath that writes out pack bitmaps.
784
+ (merged to 'next' on 2020-12-15 at 773268c2fb)
785
+ + pack-bitmap-write: better reuse bitmaps
786
+ + pack-bitmap-write: relax unique revwalk condition
787
+ + pack-bitmap-write: use existing bitmaps
788
+ + pack-bitmap: factor out 'add_commit_to_bitmap()'
789
+ + pack-bitmap: factor out 'bitmap_for_commit()'
790
+ + pack-bitmap-write: ignore BITMAP_FLAG_REUSE
791
+ + pack-bitmap-write: build fewer intermediate bitmaps
792
+ + pack-bitmap.c: check reads more aggressively when loading
793
+ + pack-bitmap-write: rename children to reverse_edges
794
+ + t5310: add branch-based checks
795
+ + commit: implement commit_list_contains()
796
+ + bitmap: implement bitmap_is_subset()
797
+ + pack-bitmap-write: fill bitmap with commit history
798
+ + pack-bitmap-write: pass ownership of intermediate bitmaps
799
+ + pack-bitmap-write: reimplement bitmap writing
800
+ + ewah: add bitmap_dup() function
801
+ + ewah: implement bitmap_or()
802
+ + ewah: make bitmap growth less aggressive
803
+ + ewah: factor out bitmap growth
804
+ + rev-list: die when --test-bitmap detects a mismatch
805
+ + t5310: drop size of truncated ewah bitmap
806
+ + pack-bitmap: bounds-check size of cache extension
807
+ + pack-bitmap: fix header size check
808
+ + ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
809
+
810
+ Various improvements to the codepath that writes out pack bitmaps.
811
795
- Will merge to 'next'.
812
+ Will cook in 'next'.
813
814
815
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits