What's cooking (2020/12 #04)
Junio C Hamano committed
Dec 22, 2020 at 12:07 UTC
43c3722b289302cf599f9e3093f2124f64e7d00f
1 file changed
+236
-314
whats-cooking.txt
+236
-314
@@ -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, #03; Fri, 18)
3
+Subject: What's cooking in git.git (Dec 2020, #04; Tue, 22)
4
X-master-at: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
5
-X-next-at: 5298b911bdfa173511fab94a90a4302a2f1965b3
5
+X-next-at: acce13e5c41814e6303336cb470967b5b6cc9211
6
7
-What's cooking in git.git (Dec 2020, #03; Fri, 18)
7
+What's cooking in git.git (Dec 2020, #04; Tue, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,12 +12,7 @@ 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 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 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.
15
+Hopefully, the second release candidate -rc2 can be tagged tomorrow.
16
17
Copies of the source code to Git live in many repositories, and the
18
following is a list of the ones I push into or their mirrors. Some
@@ -48,194 +43,79 @@ Release tarballs are available at:
43
https://www.kernel.org/pub/software/scm/git/
44
45
--------------------------------------------------
51
-[Graduated to 'master']
52
-
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
-
57
- Code clean-up.
58
-
59
-
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
- Doc update.
65
-
66
-
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
- Dev-support fix for BSD.
72
-
73
-
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
-
78
- Doc update.
79
-
80
-
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
-
85
- Fix a recent bug in a rarely used replacement code.
86
-
87
-
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
-
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
-
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
-
100
- C-std compliance fix.
101
-
102
-
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
-
107
- Doc update.
108
-
109
-
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
-
122
- Code clean-up.
123
-
124
-
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
-
132
- Our users are going to be trained to prepare for future change of
133
- init.defaultBranch configuration variable.
134
-
135
-
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
-
140
- Test update.
141
-
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
151
- (merged to 'next' on 2020-12-14 at 61ff5e9b5b)
152
- + t7900: use --fixed-value in git-maintenance tests
153
-
154
- Hotfix for test breakage.
155
-
46
+[New Topics]
47
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
48
+* dl/checkout-p-merge-base (2020-12-21) 1 commit
49
+ (merged to 'next' on 2020-12-21 at 595dd32b56)
50
+ + checkout -p: handle tree arguments correctly again
51
161
- Build update.
52
+ Fix to a regression introduced during this cycle.
53
54
+ Will merge to 'master'.
55
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
56
172
- Build optimization.
57
+* es/worktree-repair-both-moved (2020-12-21) 1 commit
58
+ - worktree: teach `repair` to fix multi-directional breakage
59
60
+ "git worktree repair" learned to take advantage of the fact that it
61
+ knows both ends (i.e. the main repository is found in the location
62
+ the command runs, the worktrees are given as arguments) to deal
63
+ with the case where both the repository and the worktree moved.
64
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
65
+ Will merge to 'next'.
66
180
- Fix potential server side resource deallocation issues when
181
- responding to a partial clone request.
67
183
---------------------------------------------------
184
-[New Topics]
68
+* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
69
+ - test: bisect-porcelain: fix location of files
70
186
-* jc/config-pretend-gitdir (2020-12-15) 1 commit
187
- - config: --pretend-git-dir for includeIf:gitdir
71
+ A 3-year old test that was not testing anything useful has been
72
+ corrected.
73
189
- WIP
74
+ Will merge to 'next'.
75
76
192
-* jc/deprecate-pack-redundant (2020-12-15) 1 commit
193
- - pack-redundant: gauge the usage before proposing its removal
77
+* ma/maintenance-crontab-fix (2020-12-21) 3 commits
78
+ (merged to 'next' on 2020-12-21 at 8cd8cc04f9)
79
+ + t7900-maintenance: test for magic markers
80
+ + gc: fix handling of crontab magic markers
81
+ + git-maintenance.txt: add missing word
82
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).
83
+ Hotfix for a topic of this cycle.
84
85
+ Will merge to 'master'.
86
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.)
87
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.
88
+* mr/bisect-in-c-4 (2020-12-21) 7 commits
89
+ - bisect--helper: retire `--check-and-set-terms` subcommand
90
+ - bisect--helper: reimplement `bisect_skip` shell function in C
91
+ - bisect--helper: retire `--bisect-auto-next` subcommand
92
+ - bisect--helper: use `res` instead of return in BISECT_RESET case option
93
+ - bisect--helper: retire `--bisect-write` subcommand
94
+ - bisect--helper: reimplement `bisect_replay` shell function in C
95
+ - bisect--helper: reimplement `bisect_log` shell function in C
96
211
- Will merge to 'next'.
97
+ Piecemeal of rewrite of "git bisect" in C continues.
98
99
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
100
+* jt/clone-unborn-head (2020-12-21) 3 commits
101
+ . clone: respect remote unborn HEAD
102
+ . connect, transport: add no-op arg for future patch
103
+ . ls-refs: report unborn targets of symrefs
104
228
- Test coverage fix.
105
+ "git clone" tries to locally check out the branch pointed at by
106
+ HEAD of the remote repository after it is done, but the protocol
107
+ did not convey the information necessary to do so when copying an
108
+ empty repository. The protocol v2 learned how to do so.
109
230
- Will merge to 'master'.
110
+ Seems to break tests when merged to 'seen'.
111
112
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
113
+* nk/refspecs-negative-fix (2020-12-21) 2 commits
114
+ (merged to 'next' on 2020-12-21 at 7d88169236)
115
+ + negative-refspec: improve comment on query_matches_negative_refspec
116
+ + negative-refspec: fix segfault on : refspec
117
237
- "git pack-redandant" when there is only one packfile used to crash,
238
- which has been corrected.
118
+ Hotfix for recent regression.
119
120
Will merge to 'master'.
121
@@ -354,6 +234,7 @@ Release tarballs are available at:
234
the hash algorithm.
235
236
Expecting a reroll. The intent is very good.
237
+ cf. <20200901144323.GA14554@dcvr>
238
239
240
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
@@ -374,7 +255,8 @@ Release tarballs are available at:
255
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
256
257
377
-* jc/war-on-dashed-git (2020-08-27) 1 commit
258
+* jc/war-on-dashed-git (2020-12-21) 2 commits
259
+ - fixup??? git: catch an attempt to run "git-foo"
260
- git: catch an attempt to run "git-foo"
261
262
The first step to remove on-disk binaries for built-in subcommands
@@ -383,20 +265,6 @@ Release tarballs are available at:
265
On hold for now.
266
267
386
-* dr/push-remoteref-fix (2020-04-23) 1 commit
387
- - remote.c: fix handling of %(push:remoteref)
388
-
389
- The "%(push:remoteref)" placeholder in the "--format=" argument of
390
- "git format-patch" (and friends) only showed what got explicitly
391
- configured, not what ref at the receiving end would be updated when
392
- "git push" was used, as it ignored the default behaviour (e.g. update
393
- the same ref as the source).
394
-
395
- Discard for now.
396
- cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
397
- cf. <20200911214358.acl3hy2e763begoo@feanor>
398
-
399
-
268
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
269
- zlib.c: use size_t for size
270
@@ -417,37 +285,6 @@ Release tarballs are available at:
285
Needs review.
286
287
420
-* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
421
- - completion: bash: shuffle __gitcomp functions
422
- - completion: bash: cleanup __gitcomp* invocations
423
- - completion: bash: add __gitcomp_opts
424
- - completion: bash: improve __gitcomp description
425
- - completion: bash: rename _get_comp_words_by_ref()
426
- - completion: bash: trivial cleanup
427
- - completion: bash: cleanup _get_comp_words_by_ref()
428
- - completion: bash: refactor _get_comp_words_by_ref()
429
- - completion: bash: simplify _get_comp_words_by_ref()
430
- - test: completion: switch __gitcomp_nl prefix test
431
- - completion: bash: simplify config_variable_name
432
- - completion: bash: improve __gitcomp suffix code
433
- - completion: bash: change suffix check in __gitcomp
434
- - completion: bash: simplify __gitcomp
435
- - completion: bash: refactor __gitcomp
436
- - completion: bash: simplify equal suffix check
437
- - completion: bash: factor out check in __gitcomp
438
- - completion: bash: get rid of any non-append code
439
- - completion: bash: get rid of _append() functions
440
- - completion: bash: remove non-append functionality
441
- - test: completion: add run_func() helper
442
- - test: completion: fix currently typed words
443
- - completion: bash: do not modify COMP_WORDBREAKS
444
- - completion: bash: fix for suboptions with value
445
- - completion: bash: add correct suffix in variables
446
- - completion: bash: fix prefix detection in branch.*
447
-
448
- Needs review.
449
-
450
-
288
* ag/merge-strategies-in-c (2020-11-24) 13 commits
289
- sequencer: use the "octopus" merge strategy without forking
290
- sequencer: use the "resolve" strategy without forking
@@ -471,6 +308,72 @@ Release tarballs are available at:
308
--------------------------------------------------
309
[Cooking]
310
311
+* fc/bash-completion-post-2.29 (2020-12-19) 4 commits
312
+ - completion: bash: fix for multiple dash commands
313
+ - completion: bash: fix for suboptions with value
314
+ - completion: bash: add correct suffix in variables
315
+ - completion: bash: fix prefix detection in branch.*
316
+
317
+ Needs review.
318
+
319
+
320
+* jc/config-pretend-gitdir (2020-12-15) 1 commit
321
+ - config: --pretend-git-dir for includeIf:gitdir
322
+
323
+ WIP
324
+
325
+
326
+* jc/deprecate-pack-redundant (2020-12-15) 1 commit
327
+ - pack-redundant: gauge the usage before proposing its removal
328
+
329
+ Warn loudly when the "pack-redundant" command, which has been left
330
+ stale with almost unusable performance issues, gets used, as we no
331
+ longer want to recommend its use (instead just "repack -d" instead).
332
+
333
+
334
+* en/merge-ort-recursive (2020-12-16) 4 commits
335
+ - merge-ort: implement merge_incore_recursive()
336
+ - merge-ort: make clear_internal_opts() aware of partial clearing
337
+ - merge-ort: copy a few small helper functions from merge-recursive.c
338
+ - commit: move reverse_commit_list() from merge-recursive
339
+ (this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
340
+
341
+ The ORT merge strategy learned to synthesize virtual ancestor tree
342
+ by recursively merging multiple merge bases together, just like the
343
+ recursive backend has done for years.
344
+
345
+ Will merge to 'next'.
346
+
347
+
348
+* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
349
+ (merged to 'next' on 2020-12-18 at d15a382d4d)
350
+ + tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
351
+ + t9902: use `main` as initial branch name
352
+ + t6302: use `main` as initial branch name
353
+ + t5703: use `main` as initial branch name
354
+ + t5510: use `main` as initial branch name
355
+ + t5505: finalize transitioning to using the branch name `main`
356
+ + t3205: finalize transitioning to using the branch name `main`
357
+ + t3203: complete the transition to using the branch name `main`
358
+ + t3201: finalize transitioning to using the branch name `main`
359
+ + t3200: finish transitioning to the initial branch name `main`
360
+ + t1400: use `main` as initial branch name
361
+
362
+ Test coverage fix.
363
+
364
+ Will merge to 'master'.
365
+
366
+
367
+* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
368
+ (merged to 'next' on 2020-12-18 at b819311529)
369
+ + pack-redundant: fix crash when one packfile in repo
370
+
371
+ "git pack-redandant" when there is only one packfile used to crash,
372
+ which has been corrected.
373
+
374
+ Will merge to 'master'.
375
+
376
+
377
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
378
- entry: add checkout_entry_ca() taking preloaded conv_attrs
379
- entry: move conv_attrs lookup up to checkout_entry()
@@ -541,7 +444,7 @@ Release tarballs are available at:
444
Expecting a reroll.
445
446
544
-* so/log-diff-merge (2020-12-16) 33 commits
447
+* so/log-diff-merge (2020-12-21) 32 commits
448
- t4013: add tests for --diff-merges=first-parent
449
- doc/git-show: include --diff-merges description
450
- doc/rev-list-options: document --first-parent changes merges format
@@ -551,8 +454,6 @@ Release tarballs are available at:
454
- diff-merges: add old mnemonic counterparts to --diff-merges
455
- diff-merges: let new options enable diff without -p
456
- 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
457
- diff-merges: implement new values for --diff-merges
458
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
459
- diff-merges: refactor opt settings into separate functions
@@ -563,6 +464,7 @@ Release tarballs are available at:
464
- t4013: add tests for -m failing to override -c/--cc
465
- t4013: support test_expect_failure through ':failure' magic
466
- diff-merges: revise revs->diff flag handling
467
+ - diff-merges: handle imply -p on -c/--cc logic for log.c
468
- diff-merges: introduce revs->first_parent_merges flag
469
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
470
- diff-merges: new function diff_merges_suppress()
@@ -590,98 +492,96 @@ Release tarballs are available at:
492
493
494
* en/merge-ort-impl (2020-12-13) 21 commits
593
- - merge-ort: free data structures in merge_finalize()
594
- - merge-ort: add implementation of record_conflicted_index_entries()
595
- - tree: enable cmp_cache_name_compare() to be used elsewhere
596
- - merge-ort: add implementation of checkout()
597
- - merge-ort: basic outline for merge_switch_to_result()
598
- - merge-ort: step 3 of tree writing -- handling subdirectories as we go
599
- - merge-ort: step 2 of tree writing -- function to create tree object
600
- - merge-ort: step 1 of tree writing -- record basenames, modes, and oids
601
- - merge-ort: have process_entries operate in a defined order
602
- - merge-ort: add a preliminary simple process_entries() implementation
603
- - merge-ort: avoid recursing into identical trees
604
- - merge-ort: record stage and auxiliary info for every path
605
- - merge-ort: compute a few more useful fields for collect_merge_info
606
- - merge-ort: avoid repeating fill_tree_descriptor() on the same tree
607
- - merge-ort: implement a very basic collect_merge_info()
608
- - merge-ort: add an err() function similar to one from merge-recursive
609
- - merge-ort: use histogram diff
610
- - merge-ort: port merge_start() from merge-recursive
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
495
+ (merged to 'next' on 2020-12-21 at c551d7bda9)
496
+ + merge-ort: free data structures in merge_finalize()
497
+ + merge-ort: add implementation of record_conflicted_index_entries()
498
+ + tree: enable cmp_cache_name_compare() to be used elsewhere
499
+ + merge-ort: add implementation of checkout()
500
+ + merge-ort: basic outline for merge_switch_to_result()
501
+ + merge-ort: step 3 of tree writing -- handling subdirectories as we go
502
+ + merge-ort: step 2 of tree writing -- function to create tree object
503
+ + merge-ort: step 1 of tree writing -- record basenames, modes, and oids
504
+ + merge-ort: have process_entries operate in a defined order
505
+ + merge-ort: add a preliminary simple process_entries() implementation
506
+ + merge-ort: avoid recursing into identical trees
507
+ + merge-ort: record stage and auxiliary info for every path
508
+ + merge-ort: compute a few more useful fields for collect_merge_info
509
+ + merge-ort: avoid repeating fill_tree_descriptor() on the same tree
510
+ + merge-ort: implement a very basic collect_merge_info()
511
+ + merge-ort: add an err() function similar to one from merge-recursive
512
+ + merge-ort: use histogram diff
513
+ + merge-ort: port merge_start() from merge-recursive
514
+ + merge-ort: add some high-level algorithm structure
515
+ + merge-ort: setup basic internal data structures
516
+ + Merge branch 'en/strmap' into en/merge-ort-impl
517
(this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
518
519
The merge backend "done right" starts to emerge.
520
618
- Will merge to 'next'.
521
+ Will cook in 'next'.
522
523
621
-* es/config-hooks (2020-12-07) 34 commits
622
- . run-command: stop thinking about hooks
623
- . receive-pack: convert receive hooks to hook.h
624
- . post-update: use hook.h library
625
- . proc-receive: acquire hook list from hook.h
626
- . receive-pack: convert 'update' hook to hook.h
627
- . reference-transaction: look for hooks in config
628
- . transport: convert pre-push hook to use config
629
- . hook: convert 'post-rewrite' hook to config
630
- . hooks: convert 'post-checkout' hook to hook library
631
- . git-p4: use 'git hook' to run hooks
632
- . receive-pack: convert push-to-checkout hook to hook.h
633
- . read-cache: convert post-index-change hook to use config
634
- . rebase: teach pre-rebase to use hook.h
635
- . gc: use hook library for pre-auto-gc hook
636
- . merge: use config-based hooks for post-merge hook
637
- . am: convert applypatch hooks to use config
638
- . commit: use config-based hooks
639
- . hooks: allow callers to capture output
640
- . run-command: allow capturing of collated output
641
- . hook: provide stdin by string_list or callback
642
- . run-command: add stdin callback for parallelization
643
- . hook: allow specifying working directory for hooks
644
- . hook: allow parallel hook execution
645
- . run-command: allow stdin for run_processes_parallel
646
- . hook: support passing stdin to hooks
647
- . hook: replace find_hook() with hook_exists()
648
- . hook: add 'run' subcommand
649
- . parse-options: parse into strvec
650
- . hook: implement hookcmd.<name>.skip
651
- . hook: respect hook.runHookDir
652
- . hook: include hookdir hook in list
653
- . hook: add list command
654
- . hook: scaffolding for git-hook subcommand
655
- . doc: propose hooks managed by the config
524
+* es/config-hooks (2020-12-21) 34 commits
525
+ - run-command: stop thinking about hooks
526
+ - receive-pack: convert receive hooks to hook.h
527
+ - post-update: use hook.h library
528
+ - proc-receive: acquire hook list from hook.h
529
+ - receive-pack: convert 'update' hook to hook.h
530
+ - reference-transaction: look for hooks in config
531
+ - transport: convert pre-push hook to use config
532
+ - hook: convert 'post-rewrite' hook to config
533
+ - hooks: convert 'post-checkout' hook to hook library
534
+ - git-p4: use 'git hook' to run hooks
535
+ - receive-pack: convert push-to-checkout hook to hook.h
536
+ - read-cache: convert post-index-change hook to use config
537
+ - rebase: teach pre-rebase to use hook.h
538
+ - gc: use hook library for pre-auto-gc hook
539
+ - merge: use config-based hooks for post-merge hook
540
+ - am: convert applypatch hooks to use config
541
+ - commit: use config-based hooks
542
+ - hooks: allow callers to capture output
543
+ - run-command: allow capturing of collated output
544
+ - hook: provide stdin by string_list or callback
545
+ - run-command: add stdin callback for parallelization
546
+ - hook: allow specifying working directory for hooks
547
+ - hook: allow parallel hook execution
548
+ - run-command: allow stdin for run_processes_parallel
549
+ - hook: support passing stdin to hooks
550
+ - hook: replace find_hook() with hook_exists()
551
+ - hook: add 'run' subcommand
552
+ - parse-options: parse into strvec
553
+ - hook: implement hookcmd.<name>.skip
554
+ - hook: respect hook.runHookDir
555
+ - hook: include hookdir hook in list
556
+ - hook: add list command
557
+ - hook: scaffolding for git-hook subcommand
558
+ - doc: propose hooks managed by the config
559
560
The "hooks defined in config" topic.
561
659
- Ejected for now, as it has been breaking the tip of 'seen' for too
660
- long.
661
-
662
-
663
-* hn/reftable (2020-12-09) 15 commits
664
- . Add "test-tool dump-reftable" command.
665
- . git-prompt: prepare for reftable refs backend
666
- . Reftable support for git-core
667
- . reftable: rest of library
668
- . reftable: reftable file level tests
669
- . reftable: read reftable files
670
- . reftable: write reftable files
671
- . reftable: a generic binary tree implementation
672
- . reftable: reading/writing blocks
673
- . reftable: (de)serialization for the polymorphic record type.
674
- . reftable: add blocksource, an abstraction for random access reads
675
- . reftable: utility functions
676
- . reftable: add error related functionality
677
- . reftable: add LICENSE
678
- . init-db: set the_repository->hash_algo early on
562
+ Expecting doc updates, but otherwise seems to be progressing nicely.
563
+
564
+
565
+* hn/reftable (2020-12-21) 16 commits
566
+ - SQUASH??? allow t0031 to run with any default branch name
567
+ - Add "test-tool dump-reftable" command.
568
+ - git-prompt: prepare for reftable refs backend
569
+ - Reftable support for git-core
570
+ - reftable: rest of library
571
+ - reftable: reftable file level tests
572
+ - reftable: read reftable files
573
+ - reftable: write reftable files
574
+ - reftable: a generic binary tree implementation
575
+ - reftable: reading/writing blocks
576
+ - reftable: (de)serialization for the polymorphic record type.
577
+ - reftable: add blocksource, an abstraction for random access reads
578
+ - reftable: utility functions
579
+ - reftable: add error related functionality
580
+ - reftable: add LICENSE
581
+ - init-db: set the_repository->hash_algo early on
582
583
The "reftable" backend for the refs API.
584
682
- Ejected for now, as it has been breaking the tip of 'seen' for too
683
- long.
684
-
585
586
* ab/mktag (2020-12-09) 11 commits
587
- SQUASH???
@@ -732,26 +632,28 @@ Release tarballs are available at:
632
633
634
* en/merge-ort-2 (2020-12-13) 7 commits
735
- - merge-ort: add modify/delete handling and delayed output processing
736
- - merge-ort: add die-not-implemented stub handle_content_merge() function
737
- - merge-ort: add function grouping comments
738
- - merge-ort: add a paths_to_free field to merge_options_internal
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
635
+ (merged to 'next' on 2020-12-21 at ef5b184349)
636
+ + merge-ort: add modify/delete handling and delayed output processing
637
+ + merge-ort: add die-not-implemented stub handle_content_merge() function
638
+ + merge-ort: add function grouping comments
639
+ + merge-ort: add a paths_to_free field to merge_options_internal
640
+ + merge-ort: add a path_conflict field to merge_options_internal
641
+ + merge-ort: add a clear_internal_opts helper
642
+ + merge-ort: add a few includes
643
(this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
644
645
More "ORT" merge strategy.
646
746
- Will merge to 'next'.
647
+ Will cook in 'next'.
648
649
650
* 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
753
- - pull: give the advice for choosing rebase/merge much later
754
- - pull: refactor fast-forward check
651
+ (merged to 'next' on 2020-12-21 at acce13e5c4)
652
+ + pull: display default warning only when non-ff
653
+ + pull: correct condition to trigger non-ff advice
654
+ + pull: get rid of unnecessary global variable
655
+ + pull: give the advice for choosing rebase/merge much later
656
+ + pull: refactor fast-forward check
657
658
When a user does not tell "git pull" to use rebase or merge, the
659
command gives a loud message telling a user to choose between
@@ -761,6 +663,8 @@ Release tarballs are available at:
663
no reason to stop or force the user to choose between rebase or
664
merge if the history fast-forwards.
665
666
+ Will cook in 'next'.
667
+
668
669
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
670
(merged to 'next' on 2020-12-14 at ccc01a5f66)
@@ -868,3 +772,21 @@ Release tarballs are available at:
772
that the "-dirty" indicator would align with "git describe --dirty",
773
which does not consider having untracked files in the working tree
774
as source of dirtiness. The inconsistency has been fixed.
775
+
776
+
777
+--------------------------------------------------
778
+[Discarded]
779
+
780
+* dr/push-remoteref-fix (2020-04-23) 1 commit
781
+ - remote.c: fix handling of %(push:remoteref)
782
+
783
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
784
+ "git format-patch" (and friends) only showed what got explicitly
785
+ configured, not what ref at the receiving end would be updated when
786
+ "git push" was used, as it ignored the default behaviour (e.g. update
787
+ the same ref as the source).
788
+
789
+ Discard for now.
790
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
791
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
792
+