What's cooking (2020/11 #06)
Junio C Hamano committed
Nov 30, 2020 at 20:43 UTC
893802c0e0029f89cd4810ba73529f4c3dba4d35
1 file changed
+175
-406
whats-cooking.txt
+175
-406
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2020, #05; Wed, 25)
4
-X-master-at: e67fbf927dfdf13d0b21dc6ea15dc3c7ef448ea0
5
-X-next-at: a3fc446d84ab72dffeba6e9dfb89723fd0545d16
3
+Subject: What's cooking in git.git (Nov 2020, #06; Mon, 30)
4
+X-master-at: 72ffeb997eaf999f6938b2a7e0d9a75dcceaa311
5
+X-next-at: 1209160524d6229d60c3301df9152cf1aa58ff6d
6
7
-What's cooking in git.git (Nov 2020, #05; Wed, 25)
7
+What's cooking in git.git (Nov 2020, #06; Mon, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,9 +12,6 @@ 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
-The number of topics merged for the next release since Git 2.29 has
16
-just passed 100 after the 8th batch of them have graduated.
17
-
15
Copies of the source code to Git live in many repositories, and the
16
following is a list of the ones I push into. Some repositories have
17
only a subset of branches.
@@ -45,193 +42,6 @@ Release tarballs are available at:
42
--------------------------------------------------
43
[Graduated to 'master']
44
48
-* ab/config-mak-uname-simplify (2020-11-11) 2 commits
49
- (merged to 'next' on 2020-11-12 at e1bd51ee71)
50
- + config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag
51
- + config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
52
-
53
- Build configuration cleanup.
54
-
55
-
56
-* en/strmap (2020-11-11) 15 commits
57
- (merged to 'next' on 2020-11-12 at 41519a5f5c)
58
- + shortlog: use strset from strmap.h
59
- + Use new HASHMAP_INIT macro to simplify hashmap initialization
60
- + strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
61
- + strmap: enable allocations to come from a mem_pool
62
- + strmap: add a strset sub-type
63
- + strmap: split create_entry() out of strmap_put()
64
- + strmap: add functions facilitating use as a string->int map
65
- + strmap: enable faster clearing and reusing of strmaps
66
- + strmap: add more utility functions
67
- + strmap: new utility functions
68
- + hashmap: provide deallocation function names
69
- + hashmap: introduce a new hashmap_partial_clear()
70
- + hashmap: allow re-use after hashmap_free()
71
- + hashmap: adjust spacing to fix argument alignment
72
- + hashmap: add usage documentation explaining hashmap_free[_entries]()
73
- (this branch is used by en/merge-ort-impl.)
74
-
75
- A specialization of hashmap that uses a string as key has been
76
- introduced. Hopefully it will see wider use over time.
77
-
78
-
79
-* fc/bash-completion-alias-of-alias (2020-11-17) 3 commits
80
- (merged to 'next' on 2020-11-18 at 4241203041)
81
- + completion: bash: improve alias loop detection
82
- (merged to 'next' on 2020-11-10 at 75f1f2b8a8)
83
- + completion: bash: check for alias loop
84
- + completion: bash: support recursive aliases
85
-
86
- The command line completion script (in contrib/) learned to expand
87
- commands that are alias of alias.
88
-
89
-
90
-* jc/ci-github-set-env (2020-11-17) 1 commit
91
- (merged to 'next' on 2020-11-19 at 00ff5e06ac)
92
- + ci: avoid `set-env` construct in print-test-failures.sh
93
-
94
- Another CI adjustment.
95
-
96
-
97
-* jc/format-patch-name-max (2020-11-09) 1 commit
98
- (merged to 'next' on 2020-11-11 at 17e19bb17a)
99
- + format-patch: make output filename configurable
100
-
101
- The maximum length of output filenames "git format-patch" creates
102
- has become configurable (used to be capped at 64).
103
-
104
-
105
-* jk/4gb-idx (2020-11-16) 5 commits
106
- (merged to 'next' on 2020-11-18 at 2f99b73bda)
107
- + packfile: detect overflow in .idx file size checks
108
- + block-sha1: take a size_t length parameter
109
- + fsck: correctly compute checksums on idx files larger than 4GB
110
- + use size_t to store pack .idx byte offsets
111
- + compute pack .idx byte offsets using size_t
112
-
113
- The code was not prepared to deal with pack .idx file that is
114
- larger than 4GB.
115
-
116
-
117
-* jk/diff-release-filespec-fix (2020-11-11) 2 commits
118
- (merged to 'next' on 2020-11-12 at 3b21625881)
119
- + t7800: simplify difftool test
120
- (merged to 'next' on 2020-11-09 at 6d89b9602d)
121
- + diff: allow passing NULL to diff_free_filespec_data()
122
- (this branch is used by js/default-branch-name-tests-final-stretch.)
123
-
124
- Running "git diff" while allowing external diff in a state with
125
- unmerged paths used to segfault, which has been corrected.
126
-
127
-
128
-* jk/rev-parse-end-of-options (2020-11-10) 3 commits
129
- (merged to 'next' on 2020-11-11 at 2d517d1608)
130
- + rev-parse: handle --end-of-options
131
- + rev-parse: put all options under the "-" check
132
- + rev-parse: don't accept options after dashdash
133
-
134
- "git rev-parse" learned the "--end-of-options" to help scripts to
135
- safely take a parameter that is supposed to be a revision, e.g.
136
- "git rev-parse --verify -q --end-of-options $rev".
137
-
138
-
139
-* jx/t5411-flake-fix (2020-11-11) 3 commits
140
- (merged to 'next' on 2020-11-18 at badb1fefe5)
141
- + receive-pack: use default version 0 for proc-receive
142
- + receive-pack: gently write messages to proc-receive
143
- + t5411: new helper filter_out_user_friendly_and_stable_output
144
-
145
- The exchange between receive-pack and proc-receive hook did not
146
- carefully check for errors.
147
-
148
-
149
-* ma/list-object-filter-opt-msgfix (2020-11-16) 1 commit
150
- (merged to 'next' on 2020-11-18 at 7cf396ee81)
151
- + list-objects-filter-options: fix function name in BUG
152
-
153
- Error message fix.
154
- We can further update it to lose the hand-maintained function name
155
- from the message, but that can be done separately.
156
-
157
-
158
-* pd/mergetool-nvimdiff (2020-11-11) 2 commits
159
- (merged to 'next' on 2020-11-12 at aff20da3a2)
160
- + mergetool: avoid letting `list_tool_variants` break user-defined setups
161
- + mergetools/bc: add `bc4` to the alias list for Beyond Compare
162
-
163
- Fix regression introduced when nvimdiff support in mergetool was added.
164
-
165
-
166
-* pk/subsub-fetch-fix (2020-11-12) 1 commit
167
- (merged to 'next' on 2020-11-18 at bdd3b21b7c)
168
- + submodules: fix of regression on fetching of non-init subsub-repo
169
-
170
- "git fetch" did not work correctly with nested submodules where the
171
- innermost submodule that is not of interest got updated in the
172
- upstream, which has been corrected.
173
-
174
-
175
-* rs/archive-plug-leak-refname (2020-11-16) 1 commit
176
- (merged to 'next' on 2020-11-19 at 270ba7b8be)
177
- + archive: release refname after use
178
-
179
- Memleak fix.
180
-
181
-
182
-* rs/gc-sort-func-cast-fix (2020-11-18) 1 commit
183
- (merged to 'next' on 2020-11-19 at 04529851e5)
184
- + gc: fix cast in compare_tasks_by_selection()
185
-
186
- Fix broken sorting of maintenance tasks.
187
-
188
-
189
-* rs/hashwrite-be64 (2020-11-12) 3 commits
190
- (merged to 'next' on 2020-11-18 at 60385c6fa1)
191
- + pack-write: use hashwrite_be64()
192
- + midx: use hashwrite_be64()
193
- + csum-file: add hashwrite_be64()
194
-
195
- Code simplification.
196
-
197
-
198
-* rs/plug-diff-cache-leak (2020-11-16) 1 commit
199
- (merged to 'next' on 2020-11-23 at a9666bbac3)
200
- + diff-lib: plug minor memory leaks in do_diff_cache()
201
-
202
- Memleak fix.
203
-
204
-
205
-* sg/bisect-approximately-halfway (2020-11-12) 1 commit
206
- (merged to 'next' on 2020-11-18 at b13026a0f3)
207
- + bisect: loosen halfway() check for a large number of commits
208
-
209
- "git bisect start/next" in a large span of history spends a lot of
210
- time trying to come up with exactly the half-way point; this can be
211
- optimized by stopping when we see a commit that is close enough to
212
- the half-way point.
213
-
214
-
215
-* sg/t5310-jgit-wants-sha1 (2020-11-16) 1 commit
216
- (merged to 'next' on 2020-11-19 at 72fb4e7155)
217
- + t5310-pack-bitmaps: skip JGit tests with SHA256
218
-
219
- Since jgit does not yet work with SHA-256 repositories, mark the
220
- tests that uses it not to run unless we are testing with ShA-1
221
- repositories.
222
-
223
-
224
-* sg/tests-prereq (2020-11-18) 2 commits
225
- (merged to 'next' on 2020-11-23 at e8926781aa)
226
- + tests: fix description of 'test_set_prereq'
227
- + tests: make sure nested lazy prereqs work reliably
228
-
229
- A lazily defined test prerequisite can now be defined in terms of
230
- another lazily defined test prerequisite.
231
-
232
---------------------------------------------------
233
-[New Topics]
234
-
45
* ab/gc-keep-base-option (2020-11-21) 2 commits
46
(merged to 'next' on 2020-11-25 at ac76ddcfe7)
47
+ gc: rename keep_base_pack variable for --keep-largest-pack
@@ -239,13 +49,13 @@ Release tarballs are available at:
49
50
Fix an option name in "gc" documentation.
51
242
- Will merge to 'master'.
52
53
+* hn/sleep-millisec-decl (2020-11-24) 1 commit
54
+ (merged to 'next' on 2020-11-25 at d11de8b987)
55
+ + move sleep_millisec to git-compat-util.h
56
245
-* en/stash-apply-sparse-checkout (2020-11-21) 3 commits
246
- - stash: fix stash application in sparse-checkouts
247
- - stash: remove unnecessary process forking
248
- - t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
57
+ Move a definition of compatibility wrapper from cache.h to
58
+ git-compat-util.h
59
60
61
* jc/do-not-just-explain-but-update-your-patch (2020-11-24) 1 commit
@@ -256,77 +66,36 @@ Release tarballs are available at:
66
review comment to use the explanation in a patch update has been
67
described.
68
259
- Will merge to 'master'.
260
-
261
-
262
-* jk/stop-pack-objects-when-push-is-killed (2020-11-21) 1 commit
263
- (merged to 'next' on 2020-11-25 at f73fb999cd)
264
- + send-pack: kill pack-objects helper on signal or exit
265
-
266
- Receiving "git push" that is killed may leave zombie pack-objects
267
- process behind, which has been corrected.
268
-
269
- Will merge to 'master'.
270
-
271
-
272
-* ma/grep-init-default (2020-11-24) 4 commits
273
- - MyFirstObjectWalk: drop `init_walken_defaults()`
274
- - grep: copy struct in one fell swoop
275
- - grep: use designated initializers for `grep_defaults`
276
- - grep: don't set up a "default" repo for grep
277
-
278
- Code clean-up.
279
-
280
- Expecting a (hopefully final) reroll.
281
- cf. <xmqqlfepg9dq.fsf@gitster.c.googlers.com>
282
-
283
-
284
-* mt/worktree-error-message-fix (2020-11-21) 1 commit
285
- (merged to 'next' on 2020-11-25 at bc887168ff)
286
- + worktree: fix order of arguments in error message
287
-
288
- Fix formulation of an error message with two placeholders in "git
289
- worktree add" subcommand.
290
-
291
- Will merge to 'master'.
292
-
293
-
294
-* na/notes-displayref-is-not-boolean (2020-11-23) 2 commits
295
- (merged to 'next' on 2020-11-25 at b0dda46b56)
296
- + t3301: test proper exit response to no-value notes.displayRef.
297
- + notes.c: fix a segfault in notes_display_config()
298
-
299
- Config parser fix for "git notes".
69
301
- Will merge to 'master'.
70
+* js/pull-rebase-use-advise (2020-11-19) 1 commit
71
+ (merged to 'next' on 2020-11-25 at 05db775119)
72
+ + pull: colorize the hint about setting `pull.rebase`
73
74
+ UI improvement.
75
304
-* fc/atmark-in-refspec (2020-11-24) 1 commit
305
- - refspec: make @ a synonym of HEAD
76
307
- "@" sometimes worked (e.g. "git push origin @:there") as a part of
308
- a refspec element, but "git push orign @" did not work, which has
309
- been corrected.
77
+* js/t1309-master-to-topic (2020-11-19) 1 commit
78
+ (merged to 'next' on 2020-11-25 at 044da285ef)
79
+ + t1309: use a neutral branch name in the `onbranch` test cases
80
81
+ Test preparation.
82
312
-* hn/sleep-millisec-decl (2020-11-24) 1 commit
313
- (merged to 'next' on 2020-11-25 at d11de8b987)
314
- + move sleep_millisec to git-compat-util.h
83
316
- Move a definition of compatibility wrapper from cache.h to
317
- git-compat-util.h
84
+* js/t2106-cleanup (2020-11-18) 3 commits
85
+ (merged to 'next' on 2020-11-23 at b1bcd5d8b2)
86
+ + t2106: ensure that the checkout fails for the expected reason
87
+ + t2106: make test independent of the current main branch name
88
+ + t2106: adjust style to the current conventions
89
319
- Will merge to 'master'.
90
+ A test script got cleaned up and then made not to depend on the
91
+ value of init.defaultBranch.
92
93
322
-* js/init-defaultbranch-advice (2020-11-24) 4 commits
323
- - init: provide useful advice about init.defaultBranch
324
- - get_default_branch_name(): prepare for showing some advice
325
- - branch -m: allow renaming a yet-unborn branch
326
- - init: document `init.defaultBranch` better
94
+* js/t3040-cleanup (2020-11-18) 1 commit
95
+ (merged to 'next' on 2020-11-23 at 88951eae2f)
96
+ + t3040: remove stale note
97
328
- Our users are going to be trained to prepare for future change of
329
- init.defaultBranch configuration variable.
98
+ Cleanup.
99
100
101
* js/t3404-master-to-primary (2020-11-24) 1 commit
@@ -336,16 +105,13 @@ Release tarballs are available at:
105
A test script got cleaned up and then made not to depend on the
106
value of init.defaultBranch.
107
339
- Will merge to 'master'.
340
-
108
342
-* jt/trace-error-on-warning (2020-11-24) 1 commit
343
- - usage: add trace2 entry upon warning()
344
-
345
- Like die() and error(), a call to warning() will also trigger a
346
- trace2 event.
109
+* js/t4015-wo-master (2020-11-19) 1 commit
110
+ (merged to 'next' on 2020-11-23 at b85c36ffb4)
111
+ + t4015: let the test pass with any default branch name
112
348
- Will merge to 'next'.
113
+ A test script got cleaned up not to depend on the value of
114
+ init.defaultBranch.
115
116
117
* km/stash-error-message-fix (2020-11-24) 1 commit
@@ -354,18 +120,21 @@ Release tarballs are available at:
120
121
Error message fix.
122
357
- Will merge to 'master'.
123
124
+* mt/worktree-error-message-fix (2020-11-21) 1 commit
125
+ (merged to 'next' on 2020-11-25 at bc887168ff)
126
+ + worktree: fix order of arguments in error message
127
360
-* ps/config-env-pairs (2020-11-24) 2 commits
361
- - config: allow specifying config entries via envvar pairs
362
- - config: extract function to parse config pairs
128
+ Fix formulation of an error message with two placeholders in "git
129
+ worktree add" subcommand.
130
364
- Introduce a way to feed configuration variable-value pairs via
365
- environment variables.
131
367
- Getting there.
368
- cf. <X74CigYS7AUtMo9Q@tanuki>
132
+* na/notes-displayref-is-not-boolean (2020-11-23) 2 commits
133
+ (merged to 'next' on 2020-11-25 at b0dda46b56)
134
+ + t3301: test proper exit response to no-value notes.displayRef.
135
+ + notes.c: fix a segfault in notes_display_config()
136
+
137
+ Config parser fix for "git notes".
138
139
140
* sa/credential-store-timeout (2020-11-25) 1 commit
@@ -376,27 +145,35 @@ Release tarballs are available at:
145
file, causing everybody else but one to fail---reattempt locking
146
with some timeout to reduce the rate of the failure.
147
379
- Will merge to 'master'.
148
+--------------------------------------------------
149
+[New Topics]
150
151
+* nk/perf-fsmonitor-cleanup (2020-11-30) 1 commit
152
+ - perf/fsmonitor: use test_must_be_empty helper
153
382
-* tb/idx-midx-race-fix (2020-11-25) 2 commits
383
- - midx.c: protect against disappearing packs
384
- - packfile.c: protect against disappearing indexes
154
+ Test clean-up.
155
+
156
+ Will merge to 'next'.
157
386
- Processes that access packdata while the .idx file gets removed
387
- (e.g. while repacking) did not fail or fall back gracefully as they
388
- could.
158
+
159
+* rs/fetch-pack-invalid-lockfile (2020-11-30) 1 commit
160
+ - fetch-pack: disregard invalid pack lockfiles
161
+
162
+ "fetch-pack" could pass NULL pointer to unlink(2) when it sees an
163
+ invalid filename; the error checking has been tightened to make
164
+ this impossible.
165
166
Will merge to 'next'.
167
168
393
-* rs/stop-pack-objects-when-fetch-is-killed (2020-11-25) 1 commit
394
- - upload-pack: kill pack-objects helper on signal or exit
169
+* rs/maintenance-run-outside-repo (2020-11-30) 1 commit
170
+ - maintenance: fix SEGFAULT when no repository
171
396
- "git upload-pack" that is killed may leave zombie pack-objects
397
- process behind, which has been corrected.
172
+ "git maintenance run/start/stop" needed to be run in a repository
173
+ to hold the lockfile they use, but didn't make sure they are
174
+ actually in a repository, which has been corrected.
175
399
- Needs to be replaced with signed-off and/or improved version.
176
+ Will merge to 'next'.
177
178
--------------------------------------------------
179
[Stalled]
@@ -688,6 +465,7 @@ Release tarballs are available at:
465
466
Needs review.
467
468
+
469
* en/merge-ort-impl (2020-11-11) 21 commits
470
- merge-ort: free data structures in merge_finalize()
471
- merge-ort: add implementation of record_unmerged_index_entries()
@@ -712,10 +490,101 @@ Release tarballs are available at:
490
- Merge branch 'en/strmap' into en/merge-ort-impl
491
492
Needs review.
493
+ A reroll exists.
494
+ cf. <pull.923.git.git.1606635803.gitgitgadget@gmail.com>
495
496
--------------------------------------------------
497
[Cooking]
498
499
+* en/stash-apply-sparse-checkout (2020-11-21) 3 commits
500
+ - stash: fix stash application in sparse-checkouts
501
+ - stash: remove unnecessary process forking
502
+ - t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
503
+
504
+
505
+* jk/stop-pack-objects-when-push-is-killed (2020-11-21) 1 commit
506
+ (merged to 'next' on 2020-11-25 at f73fb999cd)
507
+ + send-pack: kill pack-objects helper on signal or exit
508
+
509
+ Receiving "git push" that is killed may leave zombie pack-objects
510
+ process behind, which has been corrected.
511
+
512
+ Will merge to 'master'.
513
+
514
+
515
+* ma/grep-init-default (2020-11-30) 4 commits
516
+ - MyFirstObjectWalk: drop `init_walken_defaults()`
517
+ - grep: copy struct in one fell swoop
518
+ - grep: use designated initializers for `grep_defaults`
519
+ - grep: don't set up a "default" repo for grep
520
+
521
+ Code clean-up.
522
+
523
+ Will merge to 'next'.
524
+
525
+
526
+* fc/atmark-in-refspec (2020-11-30) 3 commits
527
+ - refspec: make @ a synonym of HEAD
528
+ - tests: push: trivial cleanup
529
+ - tests: push: improve cleanup of HEAD tests
530
+
531
+ "@" sometimes worked (e.g. "git push origin @:there") as a part of
532
+ a refspec element, but "git push orign @" did not work, which has
533
+ been corrected.
534
+
535
+
536
+* js/init-defaultbranch-advice (2020-11-24) 4 commits
537
+ - init: provide useful advice about init.defaultBranch
538
+ - get_default_branch_name(): prepare for showing some advice
539
+ - branch -m: allow renaming a yet-unborn branch
540
+ - init: document `init.defaultBranch` better
541
+
542
+ Our users are going to be trained to prepare for future change of
543
+ init.defaultBranch configuration variable.
544
+
545
+
546
+* jt/trace-error-on-warning (2020-11-24) 1 commit
547
+ (merged to 'next' on 2020-11-30 at 1ab8a970f8)
548
+ + usage: add trace2 entry upon warning()
549
+
550
+ Like die() and error(), a call to warning() will also trigger a
551
+ trace2 event.
552
+
553
+ Will merge to 'master'.
554
+
555
+
556
+* ps/config-env-pairs (2020-11-24) 2 commits
557
+ - config: allow specifying config entries via envvar pairs
558
+ - config: extract function to parse config pairs
559
+
560
+ Introduce a way to feed configuration variable-value pairs via
561
+ environment variables.
562
+
563
+ Getting there.
564
+ cf. <X74CigYS7AUtMo9Q@tanuki>
565
+
566
+
567
+* tb/idx-midx-race-fix (2020-11-25) 2 commits
568
+ (merged to 'next' on 2020-11-30 at 493ded178e)
569
+ + midx.c: protect against disappearing packs
570
+ + packfile.c: protect against disappearing indexes
571
+
572
+ Processes that access packdata while the .idx file gets removed
573
+ (e.g. while repacking) did not fail or fall back gracefully as they
574
+ could.
575
+
576
+ Will merge to 'master'.
577
+
578
+
579
+* rs/stop-pack-objects-when-fetch-is-killed (2020-11-25) 1 commit
580
+ - upload-pack: kill pack-objects helper on signal or exit
581
+
582
+ "git upload-pack" that is killed may leave zombie pack-objects
583
+ process behind, which has been corrected.
584
+
585
+ Needs to be replaced with signed-off and/or improved version.
586
+
587
+
588
* tb/pack-bitmap (2020-11-21) 24 commits
589
- pack-bitmap-write: better reuse bitmaps
590
- pack-bitmap-write: relax unique rewalk condition
@@ -836,37 +705,6 @@ Release tarballs are available at:
705
"git init" creates.
706
707
839
-* js/t2106-cleanup (2020-11-18) 3 commits
840
- (merged to 'next' on 2020-11-23 at b1bcd5d8b2)
841
- + t2106: ensure that the checkout fails for the expected reason
842
- + t2106: make test independent of the current main branch name
843
- + t2106: adjust style to the current conventions
844
-
845
- A test script got cleaned up and then made not to depend on the
846
- value of init.defaultBranch.
847
-
848
- Will merge to 'master'.
849
-
850
-
851
-* js/t3040-cleanup (2020-11-18) 1 commit
852
- (merged to 'next' on 2020-11-23 at 88951eae2f)
853
- + t3040: remove stale note
854
-
855
- Cleanup.
856
-
857
- Will merge to 'master'.
858
-
859
-
860
-* js/t4015-wo-master (2020-11-19) 1 commit
861
- (merged to 'next' on 2020-11-23 at b85c36ffb4)
862
- + t4015: let the test pass with any default branch name
863
-
864
- A test script got cleaned up not to depend on the value of
865
- init.defaultBranch.
866
-
867
- Will merge to 'master'.
868
-
869
-
708
* ds/config-literal-value (2020-11-25) 8 commits
709
- config doc: value-pattern is not necessarily a regexp
710
- config: implement --fixed-value with --get*
@@ -896,24 +734,6 @@ Release tarballs are available at:
734
Blocked by ds/config-literal-value.
735
736
899
-* js/pull-rebase-use-advise (2020-11-19) 1 commit
900
- (merged to 'next' on 2020-11-25 at 05db775119)
901
- + pull: colorize the hint about setting `pull.rebase`
902
-
903
- UI improvement.
904
-
905
- Will merge to 'master'.
906
-
907
-
908
-* js/t1309-master-to-topic (2020-11-19) 1 commit
909
- (merged to 'next' on 2020-11-25 at 044da285ef)
910
- + t1309: use a neutral branch name in the `onbranch` test cases
911
-
912
- Test preparation.
913
-
914
- Will merge to 'master'.
915
-
916
-
737
* ag/merge-strategies-in-c (2020-11-24) 13 commits
738
- sequencer: use the "octopus" merge strategy without forking
739
- sequencer: use the "resolve" strategy without forking
@@ -936,34 +756,36 @@ Release tarballs are available at:
756
757
758
* ps/update-ref-multi-transaction (2020-11-16) 4 commits
939
- - update-ref: disallow "start" for ongoing transactions
940
- - p1400: use `git-update-ref --stdin` to test multiple transactions
941
- - update-ref: allow creation of multiple transactions
942
- - t1400: avoid touching refs on filesystem
759
+ (merged to 'next' on 2020-11-30 at c1c3e23374)
760
+ + update-ref: disallow "start" for ongoing transactions
761
+ + p1400: use `git-update-ref --stdin` to test multiple transactions
762
+ + update-ref: allow creation of multiple transactions
763
+ + t1400: avoid touching refs on filesystem
764
765
"git update-ref --stdin" learns to take multiple transactions in a
766
single session.
767
947
- Will merge to 'next'.
768
+ Will merge to 'master'.
769
770
771
* js/add-i-color-fix (2020-11-16) 11 commits
951
- - add -i: verify in the tests that colors can be overridden
952
- - add -p: prefer color.diff.context over color.diff.plain
953
- - add -i (Perl version): color header to match the C version
954
- - add -i (built-in): use the same indentation as the Perl version
955
- - add -p (built-in): do not color the progress indicator separately
956
- - add -i (built-in): use correct names to load color.diff.* config
957
- - add -i (built-in): prevent the `reset` "color" from being configured
958
- - add -i: use `reset_color` consistently
959
- - add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
960
- - add -i (built-in): send error messages to stderr
961
- - add -i (built-in): do show an error message for incorrect inputs
772
+ (merged to 'next' on 2020-11-30 at 5cb8202cd4)
773
+ + add -i: verify in the tests that colors can be overridden
774
+ + add -p: prefer color.diff.context over color.diff.plain
775
+ + add -i (Perl version): color header to match the C version
776
+ + add -i (built-in): use the same indentation as the Perl version
777
+ + add -p (built-in): do not color the progress indicator separately
778
+ + add -i (built-in): use correct names to load color.diff.* config
779
+ + add -i (built-in): prevent the `reset` "color" from being configured
780
+ + add -i: use `reset_color` consistently
781
+ + add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
782
+ + add -i (built-in): send error messages to stderr
783
+ + add -i (built-in): do show an error message for incorrect inputs
784
785
"git add -i" failed to honor custom colors configured to show
786
patches, which has been corrected.
787
966
- Will merge to 'next'.
788
+ Will merge to 'master'.
789
cf. <20201117015149.GC19433@coredump.intra.peff.net>
790
791
@@ -1028,56 +850,3 @@ Release tarballs are available at:
850
cf. <85y2jiqq3c.fsf@gmail.com>
851
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
852
cf. <20201103053629.GA13228@Abhishek-Arch>
1031
-
1032
---------------------------------------------------
1033
-[Discarded]
1034
-
1035
-* jk/use-strset-in-shortlog (2020-11-05) 1 commit
1036
- . shortlog: drop custom strset implementation
1037
-
1038
- Now a part of the en/strmap topic.
1039
-
1040
-
1041
-* jt/push-with-base (2020-11-02) 5 commits
1042
- . SQUASH???
1043
- . Doc: push with --base
1044
- . remote-curl: teach --base for http(s)://
1045
- . push: teach --base for ssh:// and file://
1046
- . connect: refactor building of Extra Parameters
1047
-
1048
- "git push" learns a way to tell an object that it expects the other
1049
- side to have and is usable as a common ancestor, which can be used
1050
- by the other side to shrink its initial ref advertisement.
1051
-
1052
-
1053
-* rs/chdir-notify-unleak (2020-11-16) 1 commit
1054
- . chdir-notify: UNLEAK registrated callback entries
1055
-
1056
- Mark some stuff on list_head chain with UNLEAK() macro to squelch
1057
- leak checker.
1058
-
1059
- Retracted.
1060
- cf. <3b2afb7a-57aa-025c-806f-ae3faa0ed077@web.de>
1061
-
1062
-
1063
-* av/fsmonitor-cleanup (2020-10-21) 2 commits
1064
- . fsmonitor: make output of test-dump-fsmonitor more concise
1065
- . fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
1066
-
1067
- Code clean-up.
1068
-
1069
- Unneeded?
1070
- cf. <20201022183822.GA781760@nand.local>
1071
-
1072
-
1073
-* jc/init-doc-default-branch (2020-11-18) 1 commit
1074
- . "init" doc: mention the configurability more clearly
1075
-
1076
- Doc update.
1077
-
1078
-
1079
-* ds/treeless-clone-wo-submodule-recursing (2020-11-21) 1 commit
1080
- . clone: --filter=tree:0 implies fetch.recurseSubmodules=no
1081
-
1082
- Retracted.
1083
- cf. <8a31af0e-4440-d957-11fb-48c4d2abd5c7@gmail.com>