What's cooking (2021/12 #02)
Junio C Hamano committed
Dec 7, 2021 at 16:06 UTC
c161867edae5946a4fdf9a44f307e433d751da91
1 file changed
+305
-159
whats-cooking.txt
+305
-159
@@ -1,36 +1,12 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2021, #01; Fri, 3)
3
+Subject: What's cooking in git.git (Dec 2021, #02; Tue, 7)
4
X-master-at: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa
5
-X-next-at: a8338297339b1ab064e799c15c4fc56c122ef967
5
+X-next-at: 8cdad7bc9aee8e9403eb7f1ef605b37815892e18
6
7
-What's cooking in git.git (Dec 2021, #01; Fri, 3)
7
+What's cooking in git.git (Dec 2021, #02; Tue, 7)
8
--------------------------------------------------
9
10
-This is probably the first issue of the "What's cooking" report, in
11
-which all topics have some sort of description.
12
-
13
-Even better, each and every topic is annotated with some sort of
14
-verdict (like "Will discard", "Expecting a reroll", "Will merge to
15
-'next'?" etc.). There is no topic in the "Undecided" category when
16
-this report is fed to "cook -w" script (found in the 'todo' branch).
17
-
18
-A handful of topics are added to 'next', and we have about 40 topics
19
-cooking there. For them, the future is automated---they spend about
20
-a week in 'next', and if we find issues in them, we incrementally
21
-improve them, or get merged to 'master'.
22
-
23
-Then we have about a dozen topics that are marked for 'next' (please
24
-raise your hand if you have objection before a real damage is done),
25
-and 8 more that may be ready for 'next' (please raise your hand if
26
-you want to nudge them in either direction, for or against).
27
-
28
-
29
-
30
-
31
-
32
-
33
-
10
Here are the topics that have been cooking in my tree. Commits
11
prefixed with '+' are in 'next' (being in 'next' is a sign that a
12
topic is stable enough to be used and are candidate to be in a
@@ -42,12 +18,6 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
45
-A few topics for regression fixes have been merged to 'next' and
46
-will be merged to 'master' shortly. There are many topics listed as
47
-"New" that are in 'seen', but I haven't read many of them (and I
48
-shouldn't have anyway, before dealing with regression fixes) and
49
-haven't gave any summary comments in this report, either, yet.
50
-
21
Copies of the source code to Git live in many repositories, and the
22
following is a list of the ones I push into or their mirrors. Some
23
repositories have only a subset of branches.
@@ -79,6 +49,243 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[New Topics]
51
52
+* je/http-better-error-output (2021-12-03) 1 commit
53
+ . http-backend: give a hint that web browser access is not supported
54
+
55
+ When the http-backend program, which is the server-side component
56
+ for the smart HTTP transport, sends a "404 Not found" error, we
57
+ deliberately did not say anything to the requesting client. We now
58
+ send a message back to the browser to tell the user that they do
59
+ not want to visit the URL via their browser, instead of a totally
60
+ blank page.
61
+
62
+ Expecting a reroll.
63
+ Breaks its self tests.
64
+ cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
65
+ source: <20211202102855.23907-1-jengelh@inai.de>
66
+
67
+
68
+* es/doc-stdout-vs-stderr (2021-12-04) 1 commit
69
+ - CodingGuidelines: document which output goes to stdout vs. stderr
70
+
71
+ Coding guideline document has been updated to clarify what goes to
72
+ standard error i nour system.
73
+
74
+ Will merge to 'next'.
75
+ source: <20211202223110.22062-1-sunshine@sunshineco.com>
76
+
77
+
78
+* tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit
79
+ - packfile: make `close_pack_revindex()` static
80
+
81
+ Code clean-up.
82
+
83
+ Will merge to 'next'.
84
+ source: <dad2b73c84f1c1575a6bce04a449ee1236680b10.1638658219.git.me@ttaylorr.com>
85
+
86
+
87
+* ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits
88
+ - unpack-trees: use traverse_path instead of name
89
+ - t1092: add deeper changes during a checkout
90
+
91
+ The sparse-index/sparse-checkout feature had a bug in its use of
92
+ the matching code to determine which path is in or outside the
93
+ sparse checkout patterns.
94
+
95
+ Will merge to 'next'.
96
+ source: <pull.1092.v2.git.1638799837.gitgitgadget@gmail.com>
97
+
98
+
99
+* en/name-rev-shorter-output (2021-12-04) 1 commit
100
+ - name-rev: prefer shorter names over following merges
101
+
102
+ "git name-rev" has been tweaked to give output that is shorter and
103
+ easier to understand.
104
+
105
+ Will merge to 'next'?
106
+ source: <pull.1119.git.git.1636762454792.gitgitgadget@gmail.com>
107
+
108
+
109
+* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit
110
+ - sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'
111
+
112
+ "git rebase -x" by mistake started exporting the GIT_DIR and
113
+ GIT_WORK_TREE environment variables when the command was rewritten
114
+ in C, which has been corrected.
115
+
116
+ Will merge to 'next'.
117
+ source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@gmail.com>
118
+
119
+
120
+* es/worktree-chatty-to-stderr (2021-12-04) 2 commits
121
+ - git-worktree.txt: add missing `-v` to synopsis for `worktree list`
122
+ - worktree: send "chatty" messages to stderr
123
+
124
+ "git worktree add" showed "Preparing worktree" message to the
125
+ standard output stream, but when it failed, the message from die()
126
+ went to the standard error stream. Depending on the order the
127
+ stdio streams are flushed at the program end, this resulted in
128
+ confusing output. It has been corrected by sending all the chatty
129
+ messages to the standard error stream.
130
+
131
+ Will merge to 'next'.
132
+ source: <20211203034420.47447-1-sunshine@sunshineco.com>
133
+
134
+
135
+* ja/i18n-similar-messages (2021-12-05) 10 commits
136
+ - i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
137
+ - i18n: factorize "--foo outside a repository"
138
+ - i18n: refactor "unrecognized %(foo) argument" strings
139
+ - i18n: factorize "no directory given for --foo"
140
+ - i18n: factorize "--foo requires --bar" and the like
141
+ - i18n: tag.c factorize i18n strings
142
+ - i18n: standardize "cannot open" and "cannot read"
143
+ - i18n: turn "options are incompatible" into "are mutually exclusive"
144
+ - i18n: refactor "%s, %s and %s are mutually exclusive"
145
+ - i18n: refactor "foo and bar are mutually exclusive"
146
+
147
+ Similar message templates have been consolidated so that
148
+ translators need to work on fewer number of messages.
149
+
150
+ Needs review.
151
+ source: <pull.1088.git.1638514909.gitgitgadget@gmail.com>
152
+
153
+
154
+* js/test-initial-branch-override-cleanup (2021-12-05) 1 commit
155
+ - tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed
156
+
157
+ Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
158
+ mechanism to force "git" to use 'master' as the default name for
159
+ the initial branch no longer need it; the use of the mechanism from
160
+ them have been removed.
161
+
162
+ Will merge to 'next'.
163
+ source: <pull.1089.git.1638524353230.gitgitgadget@gmail.com>
164
+
165
+
166
+* ab/die-with-bug (2021-12-07) 4 commits
167
+ - object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()
168
+ - pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)
169
+ - strbuf.h: use BUG(...) not die("BUG: ...")
170
+ - pack-objects: use BUG(...) not die("BUG: ...")
171
+
172
+ Code clean-up.
173
+
174
+ Will merge to 'next'.
175
+ source: <cover-v2-0.4-00000000000-20211207T110440Z-avarab@gmail.com>
176
+
177
+
178
+* ab/usage-die-message (2021-12-07) 6 commits
179
+ - config API: use get_error_routine(), not vreportf()
180
+ - usage.c + gc: add and use a die_message_errno()
181
+ - gc: return from cmd_gc(), don't call exit()
182
+ - usage.c API users: use die_message() for error() + exit 128
183
+ - usage.c API users: use die_message() for "fatal :" + exit 128
184
+ - usage.c: add a die_message() routine
185
+
186
+ Code clean-up to hide vreportf() from public API.
187
+
188
+ Needs review.
189
+ source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>
190
+
191
+
192
+* js/compat-util-msvc-flex-array (2021-12-06) 1 commit
193
+ - git-compat-util(msvc): C11 does not imply support for zero-sized arrays
194
+
195
+ MSVC build started to break on flex arrays?
196
+
197
+ Will merge to 'next'?
198
+ source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>
199
+
200
+
201
+* ab/common-main-cleanup (2021-12-07) 1 commit
202
+ - common-main.c: call exit(), don't return
203
+
204
+ Code clean-up.
205
+
206
+ Will merge to 'next'?
207
+ source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@gmail.com>
208
+
209
+
210
+* ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit
211
+ - pull, fetch: fix segfault in --set-upstream option
212
+
213
+ "git fetch --set-upstream" did not check if there is a current
214
+ branch, leading to a segfault when it is run on a detached HEAD,
215
+ which has been corrected.
216
+
217
+ Will merge to 'next'.
218
+ source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>
219
+
220
+
221
+* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit
222
+ - cbtree: remove broken and unused cb_unlink
223
+
224
+ Code clean-up.
225
+
226
+ Will merge to 'next'.
227
+ source: <20211207183810.688481-1-e@80x24.org>
228
+
229
+--------------------------------------------------
230
+[Stalled]
231
+
232
+* ar/submodule-update (2021-10-13) 9 commits
233
+ . submodule--helper: rename helper functions
234
+ . submodule--helper: remove unused helpers
235
+ . submodule: move core cmd_update() logic to C
236
+ . submodule--helper: run update using child process struct
237
+ . submodule--helper: allow setting superprefix for init_submodule()
238
+ . submodule--helper: refactor get_submodule_displaypath()
239
+ . submodule--helper: rename helpers for update-clone
240
+ . submodule--helper: get remote names from any repository
241
+ . submodule--helper: split up ensure_core_worktree()
242
+
243
+ Rewrite of "git submodule update" in C.
244
+
245
+ Expecting a reroll?
246
+ cf. <YWiXL+plA7GHfuVv@google.com>
247
+ source: <20211013051805.45662-10-raykar.ath@gmail.com>
248
+
249
+
250
+* ms/customizable-ident-expansion (2021-09-01) 1 commit
251
+ - keyword expansion: make "$Id$" string configurable
252
+
253
+ Instead of "$Id$", user-specified string (like $FreeBSD$) can be
254
+ used as an in-blob placeholder for keyword expansion.
255
+
256
+ Will discard.
257
+ Stalled for too long.
258
+ cf. <xmqqfsuosvrh.fsf@gitster.g>
259
+ cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
260
+ source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
261
+
262
+
263
+* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
264
+ - rebase -m: don't fork git checkout
265
+ - rebase --apply: set ORIG_HEAD correctly
266
+ - rebase --apply: fix reflog
267
+ - reset_head(): take struct rebase_head_opts
268
+ - rebase: cleanup reset_head() calls
269
+ - reset_head(): make default_reflog_action optional
270
+ - reset_head(): factor out ref updates
271
+ - reset_head(): remove action parameter
272
+ - reset_head(): don't run checkout hook if there is an error
273
+ - reset_head(): fix checkout
274
+ - rebase: factor out checkout for up to date branch
275
+ - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head
276
+
277
+ Fix "some issues" in a helper function reset_head().
278
+
279
+ Expecting a reroll.
280
+ cf. <e1aadd47-533c-fd8b-4fae-f64a53c81ec9@gmail.com>
281
+ This needs a lot better explanation, including what the issues are,
282
+ which codepaths the helper is used in and to do what, and tests to
283
+ protect the fixes.
284
+ source: <pull.1049.git.1633082702.gitgitgadget@gmail.com>
285
+
286
+--------------------------------------------------
287
+[Cooking]
288
+
289
* ab/cat-file (2021-11-29) 10 commits
290
- cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
291
- object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
@@ -101,7 +308,7 @@ Release tarballs are available at:
308
source: <patch-v3-10.10-45a24f97c88-20211129T195357Z-avarab@gmail.com>
309
310
104
-* ab/grep-patterntype (2021-11-29) 7 commits
311
+* ab/grep-patterntype (2021-12-04) 7 commits
312
- grep: simplify config parsing and option parsing
313
- grep API: call grep_config() after grep_init()
314
- grep.c: don't pass along NULL callback value
@@ -112,9 +319,8 @@ Release tarballs are available at:
319
320
Some code clean-up in the "git grep" machinery.
321
115
- Need to pick up a reroll.
116
- cf. <cover-v4-0.7-00000000000-20211203T101348Z-avarab@gmail.com>
117
- source: <cover-v3-0.7-00000000000-20211129T143956Z-avarab@gmail.com>
322
+ Needs review.
323
+ source: <cover-v4-0.7-00000000000-20211203T101348Z-avarab@gmail.com>
324
325
326
* en/rebase-x-fix (2021-11-29) 1 commit
@@ -142,7 +348,7 @@ Release tarballs are available at:
348
source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
349
350
145
-* jt/conditional-config-on-remote-url (2021-11-29) 2 commits
351
+* jt/conditional-config-on-remote-url (2021-12-04) 2 commits
352
- config: include file if remote URL matches a glob
353
- config: make git_config_include() static
354
@@ -150,9 +356,8 @@ Release tarballs are available at:
356
"[includeIf <condition>]" learns to base its decision on the
357
URL of the remote repository the repository interacts with.
358
153
- Need to pick up a reroll.
154
- cf. <cover.1638487815.git.jonathantanmy@google.com>
155
- source: <3b3af0da983c65ac8282b14141495f6859cd575a.1638217387.git.jonathantanmy@google.com>
359
+ Needs review.
360
+ source: <cover.1638487815.git.jonathantanmy@google.com>
361
362
363
* tb/cruft-packs (2021-11-29) 17 commits
@@ -210,87 +415,15 @@ Release tarballs are available at:
415
source: <YahbseXEC66dK0k8@coredump.intra.peff.net>
416
417
213
-* jl/subtree-check-parents-argument-passing-fix (2021-12-01) 1 commit
418
+* jl/subtree-check-parents-argument-passing-fix (2021-12-05) 1 commit
419
- subtree: fix argument handling in check_parents
420
421
Fix performance-releated bug in "git subtree" (in contrib/).
422
423
Expecting a reroll.
219
- cf. <nycvar.QRO.7.76.6.2112031610590.63@tvgsbejvaqbjf.bet>
220
- source: <pull.1086.v2.git.1638424290015.gitgitgadget@gmail.com>
221
-
222
---------------------------------------------------
223
-[Stalled]
224
-
225
-* ar/submodule-update (2021-10-13) 9 commits
226
- . submodule--helper: rename helper functions
227
- . submodule--helper: remove unused helpers
228
- . submodule: move core cmd_update() logic to C
229
- . submodule--helper: run update using child process struct
230
- . submodule--helper: allow setting superprefix for init_submodule()
231
- . submodule--helper: refactor get_submodule_displaypath()
232
- . submodule--helper: rename helpers for update-clone
233
- . submodule--helper: get remote names from any repository
234
- . submodule--helper: split up ensure_core_worktree()
235
-
236
- Rewrite of "git submodule update" in C.
237
-
238
- Expecting a reroll?
239
- cf. <YWiXL+plA7GHfuVv@google.com>
240
- source: <20211013051805.45662-10-raykar.ath@gmail.com>
241
-
242
-
243
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
244
- - fetch: fix segfault on --set-upstream while on a detached HEAD
245
-
246
- "git fetch --set-upstream" while on detached HEAD segfaulted
247
- instead of noticing that such an operation did not make sense.
248
-
249
- Expecting a reroll.
250
- A low hanging fruit to make this usable is an addition of a few tests;
251
- any takers?
252
- cf. <CAPig+cTRXTGe-MNTy=2gk1eX8G+0fa303nrLnEtX1uHUC2usmg@mail.gmail.com>
253
- cf. <xmqqsg0ri5mq.fsf@gitster.g>
254
- source: <20210706162238.575988-1-clemens@endorphin.org>
255
-
256
-
257
-* ms/customizable-ident-expansion (2021-09-01) 1 commit
258
- - keyword expansion: make "$Id$" string configurable
259
-
260
- Instead of "$Id$", user-specified string (like $FreeBSD$) can be
261
- used as an in-blob placeholder for keyword expansion.
262
-
263
- Will discard.
264
- Stalled for too long.
265
- cf. <xmqqfsuosvrh.fsf@gitster.g>
266
- cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
267
- source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
268
-
269
-
270
-* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
271
- - rebase -m: don't fork git checkout
272
- - rebase --apply: set ORIG_HEAD correctly
273
- - rebase --apply: fix reflog
274
- - reset_head(): take struct rebase_head_opts
275
- - rebase: cleanup reset_head() calls
276
- - reset_head(): make default_reflog_action optional
277
- - reset_head(): factor out ref updates
278
- - reset_head(): remove action parameter
279
- - reset_head(): don't run checkout hook if there is an error
280
- - reset_head(): fix checkout
281
- - rebase: factor out checkout for up to date branch
282
- - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head
424
+ cf. <nycvar.QRO.7.76.6.2112072243310.90@tvgsbejvaqbjf.bet>
425
+ source: <pull.1086.v3.git.1638758742741.gitgitgadget@gmail.com>
426
284
- Fix "some issues" in a helper function reset_head().
285
-
286
- Will discard.
287
- This needs a lot better explanation, including what the issues are,
288
- which codepaths the helper is used in and to do what, and tests to
289
- protect the fixes.
290
- source: <pull.1049.git.1633082702.gitgitgadget@gmail.com>
291
-
292
---------------------------------------------------
293
-[Cooking]
427
428
* ab/ambiguous-object-name (2021-11-26) 6 commits
429
- object-name: re-use "struct strbuf" in show_ambiguous_object()
@@ -344,7 +477,7 @@ Release tarballs are available at:
477
source: <pull.1085.git.1638193666.gitgitgadget@gmail.com>
478
479
347
-* hn/allow-bogus-oid-in-ref-tests (2021-12-02) 8 commits
480
+* hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits
481
- t1430: create valid symrefs using test-helper
482
- t1430: remove refs using test-tool
483
- refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
@@ -359,7 +492,7 @@ Release tarballs are available at:
492
want to test Git in.
493
494
Will merge to 'next'.
362
- source: <pull.1147.v3.git.git.1638470403.gitgitgadget@gmail.com>
495
+ source: <pull.1147.v4.git.git.1638884300.gitgitgadget@gmail.com>
496
497
498
* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit
@@ -407,13 +540,13 @@ Release tarballs are available at:
540
source: <pull.1083.git.1637666875171.gitgitgadget@gmail.com>
541
542
410
-* jc/grep-patterntype-default-doc (2021-11-29) 1 commit
543
+* jc/grep-patterntype-default-doc (2021-12-05) 1 commit
544
- grep: clarify what `grep.patternType=default` means
545
546
Doc update.
547
415
- Will merge to 'next'.
416
- source: <xmqq7dcq62af.fsf@gitster.g>
548
+ Will merge to 'next'?
549
+ source: <xmqqy24ykdel.fsf_-_@gitster.g>
550
551
552
* ab/ci-updates (2021-11-23) 5 commits
@@ -479,6 +612,7 @@ Release tarballs are available at:
612
* hn/create-reflog-simplify (2021-11-22) 1 commit
613
(merged to 'next' on 2021-12-02 at 87ff49b776)
614
+ refs: drop force_create argument of create_reflog API
615
+ (this branch is used by hn/reftable-coverity-fixes.)
616
617
A small simplification of API.
618
@@ -603,7 +737,7 @@ Release tarballs are available at:
737
source: <20211118154317.639118-1-alexhenrie24@gmail.com>
738
739
606
-* ds/fetch-pull-with-sparse-index (2021-11-29) 3 commits
740
+* ds/fetch-pull-with-sparse-index (2021-12-06) 3 commits
741
- ls-files: add --sparse option
742
- fetch/pull: use the sparse index
743
- Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
@@ -612,8 +746,10 @@ Release tarballs are available at:
746
"git fetch" and "git pull" are now declared sparse-index clean.
747
Also "git ls-files" learns the "--sparse" option to help debugging.
748
615
- Expecting a reroll?
749
+ Expecting a reroll.
750
Discussion seems to have stalled, with a few loose ends questions.
751
+ Also since the branch that this depends on was rerolled, it may
752
+ benefit from a refresh.
753
source: <pull.1080.git.1637077083.gitgitgadget@gmail.com>
754
755
@@ -662,7 +798,11 @@ Release tarballs are available at:
798
source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>
799
800
665
-* pw/xdiff-classify-record-in-histogram (2021-11-18) 3 commits
801
+* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits
802
+ (merged to 'next' on 2021-12-07 at 8cdad7bc9a)
803
+ + xdiff: drop unused flags parameter from recs_match
804
+ + xdiff: drop xpparam_t parameter from histogram cmp_recs()
805
+ + xdiff: drop CMP_ENV macro from xhistogram
806
(merged to 'next' on 2021-12-02 at 5ccd12d09b)
807
+ xdiff: simplify comparison
808
+ xdiff: avoid unnecessary memory allocations
@@ -671,7 +811,8 @@ Release tarballs are available at:
811
"diff --histogram" optimization.
812
813
Will merge to 'master'.
674
- source: <b0bc773f51e114d96ad6efd1ebd03fb6e7646288.1637148025.git.gitgitgadget@gmail.com>
814
+ source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
815
+ source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>
816
817
818
* rs/mergesort (2021-11-18) 1 commit
@@ -684,7 +825,7 @@ Release tarballs are available at:
825
source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>
826
827
687
-* xw/am-empty (2021-12-01) 3 commits
828
+* xw/am-empty (2021-12-07) 3 commits
829
- am: support --allow-empty to record specific empty patches
830
- am: support --empty=<option> to handle empty patches
831
- doc: git-format-patch: describe the option --always
@@ -692,9 +833,8 @@ Release tarballs are available at:
833
"git am" learns "--empty=(die|drop|keep)" option to tweak what is
834
done to a piece of e-mail without a patch in it.
835
695
- Expecting a reroll.
696
- The new and the third patch seems iffy.
697
- source: <pull.1076.v14.git.1638329848.gitgitgadget@gmail.com>
836
+ Almost there.
837
+ source: <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
838
839
840
* hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit
@@ -1008,7 +1148,8 @@ Release tarballs are available at:
1148
Long-overdue correctness and performance update to "diff
1149
--color-moved" feature.
1150
1011
- Need to pick up the reroll before merging to 'next'.
1151
+ Expecting a reroll.
1152
+ cf. <e1aadd47-533c-fd8b-4fae-f64a53c81ec9@gmail.com>
1153
cf. <pull.981.v4.git.1637056178.gitgitgadget@gmail.com>
1154
1155
@@ -1134,16 +1275,14 @@ Release tarballs are available at:
1275
source: <pull.1059.v5.git.1637626833.gitgitgadget@gmail.com>
1276
1277
1137
-* js/branch-track-inherit (2021-11-18) 1 commit
1138
- - branch: add flags and config to inherit tracking
1278
+* js/branch-track-inherit (2021-12-07) 2 commits
1279
+ . branch: add flags and config to inherit tracking
1280
+ . branch: accept multiple upstream branches for tracking
1281
1282
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
1283
to have the same upstream as the "old" branch, instead of marking
1284
"old" itself as its upstream.
1143
-
1144
- Expecting a reroll.
1145
- cf. <YaaYyFhDrvEbenWa@google.com>
1146
- source: <7ad7507f183332cb2b5fdf2eb76fbbc9dd7199ef.1637085915.git.steadmon@google.com>
1285
+ source: <cover.1638859949.git.steadmon@google.com>
1286
1287
1288
* jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
@@ -1185,20 +1324,24 @@ Release tarballs are available at:
1324
source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>
1325
1326
1188
-* ld/sparse-diff-blame (2021-11-29) 3 commits
1327
+* ld/sparse-diff-blame (2021-12-06) 8 commits
1328
- blame: enable and test the sparse index
1329
- diff: enable and test the sparse index
1330
+ - diff: replace --staged with --cached in t1092 tests
1331
+ - repo-settings: prepare_repo_settings only in git repos
1332
+ - test-read-cache: set up repo after git directory
1333
+ - commit-graph: return if there is no git directory
1334
+ - git: ensure correct git directory setup with -h
1335
- Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
1336
(this branch is used by ds/fetch-pull-with-sparse-index; uses vd/sparse-reset.)
1337
1338
Teach diff and blame to work well with sparse index.
1339
1196
- Need to pick up a reroll.
1197
- cf. <pull.1050.v5.git.1638566165.gitgitgadget@gmail.com>
1198
- source: <pull.1050.v2.git.1634332835.gitgitgadget@gmail.com>
1340
+ Will merge to 'next'?
1341
+ source: <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>
1342
1343
1201
-* ns/remerge-diff (2021-10-27) 9 commits
1344
+* ns/remerge-diff (2021-12-06) 8 commits
1345
- doc/diff-options: explain the new --remerge-diff option
1346
- show, log: adapt Elijah Newren's changes to common tmp-objdir API
1347
- show, log: provide a --remerge-diff capability
@@ -1207,7 +1350,6 @@ Release tarballs are available at:
1350
- merge-ort: add ability to record conflict messages in a file
1351
- merge-ort: mark a few more conflict messages as omittable
1352
- Merge branch 'ns/tmp-objdir' into ns/remerge-diff
1210
- - Merge branch 'ns/tmp-objdir' into ns/remerge-diff
1353
(this branch uses ns/tmp-objdir.)
1354
1355
A new presentation for two-parent merge "--remerge-diff" can be
@@ -1221,9 +1363,7 @@ Release tarballs are available at:
1363
them to longer-term storage" infrastructure with another topic.
1364
1365
1224
-* ns/tmp-objdir (2021-10-27) 4 commits
1225
- - fixup! tmp-objdir: new API for creating temporary writable databases
1226
- - fixup! tmp-objdir: new API for creating temporary writable databases
1366
+* ns/tmp-objdir (2021-12-06) 2 commits
1367
- tmp-objdir: disable ref updates when replacing the primary odb
1368
- tmp-objdir: new API for creating temporary writable databases
1369
(this branch is used by ns/batched-fsync and ns/remerge-diff.)
@@ -1231,11 +1371,8 @@ Release tarballs are available at:
1371
New interface into the tmp-objdir API to help in-core use of the
1372
quarantine feature.
1373
1234
- Expecting a reroll.
1235
- cf. <CANQDOddCC7+gGUy1VBxxwvN7ieP+N8mQhbxK2xx6ySqZc6U7-g@mail.gmail.com>
1236
- cf. <CABPp-BHq4DnkCZZ+HcnGiZYKHpWJgzMBjMDuWbbTFYPesm2sXA@mail.gmail.com>
1237
- cf. <pull.1076.v9.git.git.1637020263.gitgitgadget@gmail.com>
1238
- cf. <ef5a087813b7dfd232a9366eee09774d197e2307.1635287730.git.gitgitgadget@gmail.com>
1374
+ Needs an Ack or Reviewed-by.
1375
+ source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>
1376
1377
1378
* vd/sparse-reset (2021-11-29) 8 commits
@@ -1272,8 +1409,7 @@ Release tarballs are available at:
1409
source: <20211117005701.371808-1-emilyshaffer@google.com>
1410
1411
1275
-* ns/batched-fsync (2021-10-27) 9 commits
1276
- - Merge branch 'ns/tmp-objdir' into ns/batched-fsync
1412
+* ns/batched-fsync (2021-12-06) 8 commits
1413
- core.fsyncobjectfiles: performance tests for add and stash
1414
- core.fsyncobjectfiles: tests for batch mode
1415
- unpack-objects: use the bulk-checkin infrastructure
@@ -1289,7 +1425,7 @@ Release tarballs are available at:
1425
1426
Expecting a reroll.
1427
cf. <CABPp-BHq4DnkCZZ+HcnGiZYKHpWJgzMBjMDuWbbTFYPesm2sXA@mail.gmail.com>
1292
- source: <f4fa20f591e580107b961aa1ca46d844603559d6.1633366668.git.gitgitgadget@gmail.com>
1428
+ source: <pull.1076.v9.git.git.1637020263.gitgitgadget@gmail.com>
1429
1430
1431
* en/zdiff3 (2021-12-01) 2 commits
@@ -1302,7 +1438,7 @@ Release tarballs are available at:
1438
source: <pull.1036.v5.git.git.1638317108.gitgitgadget@gmail.com>
1439
1440
1305
-* js/scalar (2021-12-01) 17 commits
1441
+* js/scalar (2021-12-04) 15 commits
1442
- scalar: implement the `version` command
1443
- scalar: implement the `delete` command
1444
- scalar: teach 'reconfigure' to optionally handle all registered enlistments
@@ -1314,8 +1450,6 @@ Release tarballs are available at:
1450
- scalar: let 'unregister' handle a deleted enlistment directory gracefully
1451
- scalar: 'unregister' stops background maintenance
1452
- scalar: 'register' sets recommended config and starts maintenance
1317
- - ci: also run the `scalar` tests
1318
- - cmake: optionally build `scalar`, too
1453
- scalar: create test infrastructure
1454
- scalar: start documenting the command
1455
- scalar: create a rudimentary executable
@@ -1323,9 +1457,8 @@ Release tarballs are available at:
1457
1458
Add pieces from "scalar" to contrib/.
1459
1326
- Need to pick up the reroll before merging to 'next'.
1327
- cf. <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
1328
- source: <pull.1005.v9.git.1638273289.gitgitgadget@gmail.com>
1460
+ Will merge to 'next'?
1461
+ source: <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
1462
1463
1464
* ab/only-single-progress-at-once (2021-11-03) 8 commits
@@ -1368,9 +1501,22 @@ Release tarballs are available at:
1501
+ reftable: add error related functionality
1502
+ reftable: add LICENSE
1503
+ hash.h: provide constants for the hash IDs
1504
+ (this branch is used by hn/reftable-coverity-fixes.)
1505
1506
The "reftable" backend for the refs API, without integrating into
1507
the refs subsystem, has been added.
1508
1509
Will merge to 'master'.
1510
source: <pull.1081.v4.git.git.1633638315.gitgitgadget@gmail.com>
1511
+
1512
+--------------------------------------------------
1513
+[Discarded]
1514
+
1515
+* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
1516
+ . fetch: fix segfault on --set-upstream while on a detached HEAD
1517
+
1518
+ "git fetch --set-upstream" while on detached HEAD segfaulted
1519
+ instead of noticing that such an operation did not make sense.
1520
+
1521
+ Superseded by the ab/fetch-set-upstream-while-detached topic
1522
+ source: <20210706162238.575988-1-clemens@endorphin.org>