What's cooking (2024/03 #03)
Junio C Hamano committed
Mar 11, 2024 at 15:39 UTC
74c44febb4006de36ad47e582156fe6e28fcb93d
1 file changed
+146
-361
whats-cooking.txt
+146
-361
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2024, #02; Thu, 7)
3
-X-master-at: e09f1254c54329773904fe25d7c545a1fb4fa920
4
-X-next-at: c1ea87d7ee147b4fd526f238b8e20889c532d10d
2
+Subject: What's cooking in git.git (Mar 2024, #03; Mon, 11)
3
+X-master-at: 945115026aa63df4ab849ab14a04da31623abece
4
+X-next-at: 1203cff8ae1e19af27c286764313c3e3f54ef01e
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2024, #02; Thu, 7)
7
+What's cooking in git.git (Mar 2024, #03; Mon, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -50,291 +50,137 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
53
-* ak/rebase-autosquash (2024-02-27) 1 commit
54
- (merged to 'next' on 2024-03-01 at 57a34830b7)
55
- + rebase: fix typo in autosquash documentation
56
-
57
- Originally merged to 'next' on 2024-02-27
58
-
59
- Typofix.
60
- source: <pull.1676.git.1709015578890.gitgitgadget@gmail.com>
61
-
62
-
63
-* cc/rev-list-allow-missing-tips (2024-02-28) 5 commits
64
- (merged to 'next' on 2024-03-01 at fd7b109d04)
65
- + revision: fix --missing=[print|allow*] for annotated tags
66
- (merged to 'next' on 2024-03-01 at ac0fc94378)
67
- + rev-list: allow missing tips with --missing=[print|allow*]
68
- + t6022: fix 'test' style and 'even though' typo
69
- + oidset: refactor oidset_insert_from_set()
70
- + revision: clarify a 'return NULL' in get_reference()
71
-
72
- Originally merged to 'next' on 2024-02-28
73
-
74
- "git rev-list --missing=print" has learned to optionally take
75
- "--allow-missing-tips", which allows the objects at the starting
76
- points to be missing.
77
- source: <20240214142513.4002639-1-christian.couder@gmail.com>
78
-
79
-
80
-* eg/add-uflags (2024-02-29) 1 commit
81
- (merged to 'next' on 2024-03-01 at 5dbc997561)
82
- + add: use unsigned type for collection of bits
83
-
84
- Originally merged to 'next' on 2024-02-29
85
-
86
- Code clean-up practice.
87
- source: <20240229194444.8499-2-giganteeugenio2@gmail.com>
88
-
89
-
90
-* jc/doc-compat-util (2024-02-27) 1 commit
91
- (merged to 'next' on 2024-03-01 at 89b76c65d7)
92
- + doc: clarify the wording on <git-compat-util.h> requirement
93
-
94
- Originally merged to 'next' on 2024-02-27
95
-
96
- Clarify wording in the CodingGuidelines that requires <git-compat-util.h>
97
- to be the first header file.
98
- source: <xmqqle76kdpr.fsf_-_@gitster.g>
99
-
100
-
101
-* jc/no-include-of-compat-util-from-headers (2024-02-24) 1 commit
102
- (merged to 'next' on 2024-03-01 at ebb921087e)
103
- + compat: drop inclusion of <git-compat-util.h>
104
-
105
- Originally merged to 'next' on 2024-02-26
106
-
107
- Header file clean-up.
108
- source: <xmqqwmqtli18.fsf@gitster.g>
109
-
110
-
111
-* jc/no-lazy-fetch (2024-02-27) 3 commits
112
- (merged to 'next' on 2024-03-01 at 14303cdbfe)
113
- + git: extend --no-lazy-fetch to work across subprocesses
114
- + git: document GIT_NO_REPLACE_OBJECTS environment variable
115
- + git: --no-lazy-fetch option
116
-
117
- Originally merged to 'next' on 2024-02-29
118
-
119
- "git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy
120
- fetching of objects from the promisor remote, which may be handy
121
- for debugging.
122
- source: <xmqq1q8xx38i.fsf@gitster.g>
123
- source: <xmqq1q9cl3xv.fsf@gitster.g>
124
- source: <xmqq1q9mmtpw.fsf@gitster.g>
125
-
126
-
127
-* jk/reflog-special-cases-fix (2024-02-26) 3 commits
128
- (merged to 'next' on 2024-03-01 at 2b67f6e668)
129
- + read_ref_at(): special-case ref@{0} for an empty reflog
130
- + get_oid_basic(): special-case ref@{n} for oldest reflog entry
131
- + Revert "refs: allow @{n} to work with n-sized reflog"
132
-
133
- Originally merged to 'next' on 2024-02-27
134
-
135
- The logic to access reflog entries by date and number had ugly
136
- corner cases at the boundaries, which have been cleaned up.
137
- source: <20240226100010.GA1214708@coredump.intra.peff.net>
138
-
139
-
140
-* jk/textconv-cache-outside-repo-fix (2024-02-26) 1 commit
141
- (merged to 'next' on 2024-03-01 at 8508b83758)
142
- + userdiff: skip textconv caching when not in a repository
143
-
144
- Originally merged to 'next' on 2024-02-26
145
-
146
- The code incorrectly attempted to use textconv cache when asked,
147
- even when we are not running in a repository, which has been
148
- corrected.
149
- source: <20240226102729.GB2685773@coredump.intra.peff.net>
150
-
151
-
152
-* jk/upload-pack-bounded-resources (2024-02-28) 9 commits
153
- (merged to 'next' on 2024-03-01 at b70b6f0913)
154
- + upload-pack: free tree buffers after parsing
155
- + upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more places
156
- + upload-pack: always turn off save_commit_buffer
157
- + upload-pack: disallow object-info capability by default
158
- + upload-pack: accept only a single packfile-uri line
159
- + upload-pack: use a strmap for want-ref lines
160
- + upload-pack: use oidset for deepen_not list
161
- + upload-pack: switch deepen-not list to an oid_array
162
- + upload-pack: drop separate v2 "haves" array
163
-
164
- Originally merged to 'next' on 2024-02-29
165
-
166
- Various parts of upload-pack has been updated to bound the resource
167
- consumption relative to the size of the repository to protect from
168
- abusive clients.
169
- source: <20240228223700.GA1157826@coredump.intra.peff.net>
170
-
171
-
172
-* jk/upload-pack-v2-capability-cleanup (2024-02-29) 4 commits
173
- (merged to 'next' on 2024-03-01 at 2750893db7)
174
- + upload-pack: only accept packfile-uris if we advertised it
175
- + upload-pack: use existing config mechanism for advertisement
176
- + upload-pack: centralize setup of sideband-all config
177
- + upload-pack: use repository struct to get config
178
-
179
- Originally merged to 'next' on 2024-02-29
180
-
181
- The upload-pack program, when talking over v2, accepted the
182
- packfile-uris protocol extension from the client, even if it did
183
- not advertise the capability, which has been corrected.
184
- source: <20240228224625.GA1158651@coredump.intra.peff.net>
185
-
186
-
187
-* js/merge-tree-3-trees (2024-02-23) 7 commits
188
- (merged to 'next' on 2024-03-01 at a75dc95f04)
189
- + fill_tree_descriptor(): mark error message for translation
190
- + cache-tree: avoid an unnecessary check
191
- + Always check `parse_tree*()`'s return value
192
- + t4301: verify that merge-tree fails on missing blob objects
193
- + merge-ort: do check `parse_tree()`'s return value
194
- + merge-tree: fail with a non-zero exit code on missing tree objects
195
- + merge-tree: accept 3 trees as arguments
196
-
197
- Originally merged to 'next' on 2024-02-28
198
-
199
- "git merge-tree" has learned that the three trees involved in the
200
- 3-way merge only need to be trees, not necessarily commits.
201
- source: <pull.1647.git.1706277694231.gitgitgadget@gmail.com>
202
- source: <pull.1651.v4.git.1708677266.gitgitgadget@gmail.com>
203
-
204
-
205
-* js/remove-cruft-files (2024-02-26) 1 commit
206
- (merged to 'next' on 2024-03-01 at 63100a274b)
207
- + neue: remove a bogus empty file
208
-
209
- Originally merged to 'next' on 2024-02-26
53
+* es/config-doc-sort-sections (2024-02-29) 1 commit
54
+ (merged to 'next' on 2024-03-04 at 0752144ed7)
55
+ + docs: sort configuration variable groupings alphabetically
56
211
- Remove an empty file that shouldn't have been added in the first
212
- place.
213
- source: <pull.1674.git.1708958183225.gitgitgadget@gmail.com>
57
+ Doc updates.
58
+ source: <20240229190229.20222-1-ericsunshine@charter.net>
59
60
216
-* jt/commit-redundant-scissors-fix (2024-02-27) 2 commits
217
- (merged to 'next' on 2024-03-01 at e5983498f1)
218
- + commit: unify logic to avoid multiple scissors lines when merging
219
- + commit: avoid redundant scissor line with --cleanup=scissors -v
61
+* js/merge-base-with-missing-commit (2024-03-09) 13 commits
62
+ (merged to 'next' on 2024-03-09 at caa7a7baaa)
63
+ + merge-ort/merge-recursive: do report errors in `merge_submodule()`
64
+ + merge-recursive: prepare for `merge_submodule()` to report errors
65
+ (merged to 'next' on 2024-03-01 at 3e3eabaee9)
66
+ + commit-reach(repo_get_merge_bases_many_dirty): pass on errors
67
+ + commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors
68
+ + commit-reach(get_octopus_merge_bases): pass on "missing commits" errors
69
+ + commit-reach(repo_get_merge_bases): pass on "missing commits" errors
70
+ + commit-reach(get_merge_bases_many_0): pass on "missing commits" errors
71
+ + commit-reach(merge_bases_many): pass on "missing commits" errors
72
+ + commit-reach(paint_down_to_common): start reporting errors
73
+ + commit-reach(paint_down_to_common): prepare for handling shallow commits
74
+ + commit-reach(repo_in_merge_bases_many): report missing commits
75
+ + commit-reach(repo_in_merge_bases_many): optionally expect missing commits
76
+ + commit-reach(paint_down_to_common): plug two memory leaks
77
78
Originally merged to 'next' on 2024-02-29
79
223
- "git commit -v --cleanup=scissors" used to add the scissors line
224
- twice in the log message buffer, which has been corrected.
225
- source: <Zd2eLxPelxvP8FDk@localhost>
226
-
227
-
228
-* kn/for-all-refs (2024-02-23) 6 commits
229
- (merged to 'next' on 2024-03-01 at 76a1297ace)
230
- + for-each-ref: add new option to include root refs
231
- + ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'
232
- + refs: introduce `refs_for_each_include_root_refs()`
233
- + refs: extract out `loose_fill_ref_dir_regular_file()`
234
- + refs: introduce `is_pseudoref()` and `is_headref()`
235
- + Merge branch 'ps/reftable-backend' into kn/for-all-refs
236
-
237
- Originally merged to 'next' on 2024-02-27
238
-
239
- "git for-each-ref" learned "--include-root-refs" option to show
240
- even the stuff outside the 'refs/' hierarchy.
241
- source: <20240223100112.44127-1-karthik.188@gmail.com>
80
+ Make sure failure return from merge_bases_many() is properly caught.
81
+ source: <pull.1657.v4.git.1709113457.gitgitgadget@gmail.com>
82
+ source: <pull.1686.git.1709993397.gitgitgadget@gmail.com>
83
84
244
-* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-28) 2 commits
245
- (merged to 'next' on 2024-03-01 at 339111ec08)
246
- + revision: implement `git log --merge` also for rebase/cherry-pick/revert
247
- + revision: ensure MERGE_HEAD is a ref in prepare_show_merge
85
+* kh/doc-dashed-commands-have-not-worked-for-a-long-time (2024-03-01) 1 commit
86
+ (merged to 'next' on 2024-03-04 at 7e070c67f9)
87
+ + gitcli: drop mention of “non-dashed form”
88
249
- Originally merged to 'next' on 2024-02-29
89
+ Doc update.
90
+ source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name>
91
251
- "git log --merge" learned to pay attention to CHERRY_PICK_HEAD and
252
- other kinds of *_HEAD pseudorefs.
253
- source: <20240228-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v6-0-8ec34c052b39@gmail.com>
92
93
+* rs/t-ctype-simplify (2024-03-03) 4 commits
94
+ (merged to 'next' on 2024-03-04 at 9bd84a8877)
95
+ + t-ctype: avoid duplicating class names
96
+ + t-ctype: align output of i
97
+ + t-ctype: simplify EOF check
98
+ + t-ctype: allow NUL anywhere in the specification string
99
256
-* pb/ort-make-submodule-conflict-message-an-advice (2024-02-26) 1 commit
257
- (merged to 'next' on 2024-03-01 at df880cde2e)
258
- + merge-ort: turn submodule conflict suggestions into an advice
100
+ Code simplification to one unit-test program.
101
+ source: <20240303101330.20187-1-l.s.r@web.de>
102
260
- Originally merged to 'next' on 2024-02-27
103
262
- When a merge conflicted at a submodule, merge-ort backend used to
263
- unconditionally give a lengthy message to suggest how to resolve
264
- it. Now the message can be squelched as an advice message.
265
- source: <pull.1661.v2.git.git.1708954048301.gitgitgadget@gmail.com>
104
+* sj/t9117-path-is-file (2024-03-04) 1 commit
105
+ (merged to 'next' on 2024-03-04 at de5f6a74cb)
106
+ + t9117: prefer test_path_* helper functions
107
108
+ GSoC practice to replace "test -f" with "test_path_is_file".
109
+ source: <20240304095436.56399-2-shejialuo@gmail.com>
110
268
-* ps/reftable-repo-init-fix (2024-02-27) 2 commits
269
- (merged to 'next' on 2024-03-01 at abbf85051b)
270
- + refs/reftable: don't fail empty transactions in repo without HEAD
271
- + Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo-init-fix
272
- (this branch uses ps/remote-helper-repo-initialization-fix.)
111
+--------------------------------------------------
112
+[New Topics]
113
274
- Originally merged to 'next' on 2024-02-29
114
+* jc/safe-implicit-bare (2024-03-11) 1 commit
115
+ - setup: notice more types of implicit bare repositories
116
276
- Clear the fallout from a fix for 2.44 regression.
277
- source: <95be968e10bd02c64448786e690bbefe5c082577.1709041721.git.ps@pks.im>
117
+ Users with safe.bareRepository=explicit can still work from within
118
+ $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/)
119
+ of the primary worktree without explicitly specifying the $GIT_DIR
120
+ environment variable or the --git-dir=<path> option.
121
122
+ Will merge to 'next'.
123
+ source: <xmqq5xxv0ywi.fsf_-_@gitster.g>
124
280
-* ps/remote-helper-repo-initialization-fix (2024-02-27) 1 commit
281
- (merged to 'next' on 2024-03-01 at 7b79ffbd8f)
282
- + builtin/clone: allow remote helpers to detect repo
283
- (this branch is used by ps/reftable-repo-init-fix.)
125
285
- Originally merged to 'next' on 2024-02-29
126
+* pw/checkout-conflict-errorfix (2024-03-08) 4 commits
127
+ - checkout: cleanup --conflict=<style> parsing
128
+ - merge options: add a conflict style member
129
+ - merge-ll: introduce LL_MERGE_OPTIONS_INIT
130
+ - xdiff-interface: refactor parsing of merge.conflictstyle
131
287
- A custom remote helper no longer cannot access the newly created
288
- repository during "git clone", which is a regression in Git 2.44.
289
- This has been corrected.
290
- source: <9d888adf92e9a8af7c18847219f97d3e595e3e36.1709041721.git.ps@pks.im>
132
+ "git checkout --conflict=bad" reported a bad conflictStyle as if it
133
+ were given to a configuration variable; it has been corrected to
134
+ report that the command line option is bad.
135
136
+ Expecting a reroll.
137
+ cf. <1fb1c84a-b6b3-4e3e-896f-5fb93cff57a6@gmail.com>
138
+ source: <pull.1684.git.1709907270.gitgitgadget@gmail.com>
139
293
-* rs/fetch-simplify-with-starts-with (2024-02-26) 1 commit
294
- (merged to 'next' on 2024-03-01 at 000e015fff)
295
- + fetch: convert strncmp() with strlen() to starts_with()
140
297
- Originally merged to 'next' on 2024-02-27
141
+* bl/cherry-pick-empty (2024-03-11) 7 commits
142
+ - cherry-pick: add `--empty` for more robust redundant commit handling
143
+ - cherry-pick: enforce `--keep-redundant-commits` incompatibility
144
+ - sequencer: do not require `allow_empty` for redundant commit options
145
+ - sequencer: treat error reading HEAD as unborn branch
146
+ - rebase: update `--empty=ask` to `--empty=stop`
147
+ - docs: clean up `--empty` formatting in git-rebase(1) and git-am (1)
148
+ - docs: address inaccurate `--empty` default with `--exec`
149
299
- Code simplification.
300
- source: <cb94b938-03f9-4dd3-84c1-f5244ca81be3@web.de>
150
+ source: <20240119060721.3734775-2-brianmlyles@gmail.com>
151
152
303
-* rs/name-rev-with-mempool (2024-02-26) 2 commits
304
- (merged to 'next' on 2024-03-01 at d53eac1836)
305
- + name-rev: use mem_pool_strfmt()
306
- + mem-pool: add mem_pool_strfmt()
153
+* ie/config-includeif-hostname (2024-03-10) 1 commit
154
+ - config: learn the "hostname:" includeIf condition
155
308
- Originally merged to 'next' on 2024-02-27
156
+ source: <20240309181828.45496-2-ignacio@iencinas.com>
157
310
- Many small allocations "git name-rev" makes have been updated to
311
- allocate from a mem-pool.
312
- source: <20240225113947.89357-1-l.s.r@web.de>
158
159
+* ja/doc-markup-fixes (2024-03-11) 6 commits
160
+ - doc: git-clone: format placeholders
161
+ - doc: git-clone: format verbatim words
162
+ - doc: git-init: rework config item init.templateDir
163
+ - doc: git-init: rework definition lists
164
+ - doc: git-init: format placeholders
165
+ - doc: git-init: format verbatim parts
166
315
-* rs/submodule-prefix-simplify (2024-02-26) 1 commit
316
- (merged to 'next' on 2024-03-01 at 05d4d90201)
317
- + submodule: use strvec_pushf() for --submodule-prefix
167
+ source: <pull.1687.git.1710097830.gitgitgadget@gmail.com>
168
319
- Originally merged to 'next' on 2024-02-27
169
321
- Code simplification.
322
- source: <8cd983fb-32b9-41c6-a9e7-a485b190488c@web.de>
170
+* jk/doc-remote-helper-object-format-option (2024-03-10) 2 commits
171
+ - doc/gitremote-helpers: match object-format option docs to code
172
+ - t5801: fix object-format handling in git-remote-testgit
173
174
+ source: <20240307084735.GA2072130@coredump.intra.peff.net>
175
325
-* sg/upload-pack-error-message-fix (2024-02-26) 1 commit
326
- (merged to 'next' on 2024-03-01 at b94664a7a0)
327
- + upload-pack: don't send null character in abort message to the client
176
329
- Originally merged to 'next' on 2024-02-27
177
+* pb/ci-win-artifact-names-fix (2024-03-11) 1 commit
178
+ - ci(github): make Windows test artifacts name unique
179
331
- An error message from "git upload-pack", which responds to "git
332
- fetch" requests, had a trialing NUL in it, which has been
333
- corrected.
334
- source: <20240225183452.1939334-1-szeder.dev@gmail.com>
180
+ source: <pull.1688.git.1710101097072.gitgitgadget@gmail.com>
181
182
--------------------------------------------------
337
-[New Topics]
183
+[Cooking]
184
185
* ag/t0010-modernize (2024-03-05) 1 commit
186
(merged to 'next' on 2024-03-07 at 38339abc2d)
@@ -392,11 +238,12 @@ Release tarballs are available at:
238
239
240
* jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit
395
- - doc/gitremote-helpers: fix missing single-quote
241
+ (merged to 'next' on 2024-03-08 at 2cded1c696)
242
+ + doc/gitremote-helpers: fix missing single-quote
243
244
Doc mark-up fix.
245
399
- Will merge to 'next'.
246
+ Will merge to 'master'.
247
source: <20240307084313.GA2072022@coredump.intra.peff.net>
248
249
@@ -468,7 +315,10 @@ Release tarballs are available at:
315
The code to iterate over reflogs in the reftable has been optimized
316
to reduce memory allocation and deallocation.
317
471
- Needs review.
318
+ Reviewed-by: Josh Steadmon <steadmon@google.com>
319
+ cf. <Ze9eX-aaWoVaqsPP@google.com>
320
+
321
+ Will merge to 'next'?
322
source: <cover.1709640322.git.ps@pks.im>
323
324
@@ -480,28 +330,6 @@ Release tarballs are available at:
330
Needs review.
331
source: <pull.1682.v2.git.git.1709756493673.gitgitgadget@gmail.com>
332
483
---------------------------------------------------
484
-[Cooking]
485
-
486
-* es/config-doc-sort-sections (2024-02-29) 1 commit
487
- (merged to 'next' on 2024-03-04 at 0752144ed7)
488
- + docs: sort configuration variable groupings alphabetically
489
-
490
- Doc updates.
491
-
492
- Will merge to 'master'.
493
- source: <20240229190229.20222-1-ericsunshine@charter.net>
494
-
495
-
496
-* kh/doc-dashed-commands-have-not-worked-for-a-long-time (2024-03-01) 1 commit
497
- (merged to 'next' on 2024-03-04 at 7e070c67f9)
498
- + gitcli: drop mention of “non-dashed form”
499
-
500
- Doc update.
501
-
502
- Will merge to 'master'.
503
- source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name>
504
-
333
334
* jc/xwrite-cleanup (2024-03-02) 3 commits
335
(merged to 'next' on 2024-03-07 at 43e66f7e4d)
@@ -554,9 +382,10 @@ Release tarballs are available at:
382
383
384
* jh/trace2-missing-def-param-fix (2024-03-07) 3 commits
557
- - trace2: emit 'def_param' set with 'cmd_name' event
558
- - trace2: avoid emitting 'def_param' set more than once
559
- - t0211: demonstrate missing 'def_param' events for certain commands
385
+ (merged to 'next' on 2024-03-08 at a797cfea3c)
386
+ + trace2: emit 'def_param' set with 'cmd_name' event
387
+ + trace2: avoid emitting 'def_param' set more than once
388
+ + t0211: demonstrate missing 'def_param' events for certain commands
389
390
Some trace2 events that lacked def_param have learned to show it,
391
enriching the output.
@@ -564,7 +393,7 @@ Release tarballs are available at:
393
Reviewed-by: Josh Steadmon <steadmon@google.com>
394
cf. <ZejkVOVQBZhLVfHW@google.com>
395
567
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
source: <pull.1679.v2.git.1709824949.gitgitgadget@gmail.com>
398
399
@@ -597,16 +426,6 @@ Release tarballs are available at:
426
source: <20240303121944.20627-1-l.s.r@web.de>
427
428
600
-* sj/t9117-path-is-file (2024-03-04) 1 commit
601
- (merged to 'next' on 2024-03-04 at de5f6a74cb)
602
- + t9117: prefer test_path_* helper functions
603
-
604
- GSoC practice to replace "test -f" with "test_path_is_file".
605
-
606
- Will merge to 'master'.
607
- source: <20240304095436.56399-2-shejialuo@gmail.com>
608
-
609
-
429
* vm/t7301-use-test-path-helpers (2024-03-06) 1 commit
430
(merged to 'next' on 2024-03-07 at e638654635)
431
+ t7301: use test_path_is_(missing|file)
@@ -618,10 +437,10 @@ Release tarballs are available at:
437
438
439
* cw/git-std-lib (2024-02-28) 4 commits
621
- . SQUASH??? get rid of apparent debugging crufts
622
- . test-stdlib: show that git-std-lib is independent
623
- . git-std-lib: introduce Git Standard Library
624
- . pager: include stdint.h because uintmax_t is used
440
+ - SQUASH??? get rid of apparent debugging crufts
441
+ - test-stdlib: show that git-std-lib is independent
442
+ - git-std-lib: introduce Git Standard Library
443
+ - pager: include stdint.h because uintmax_t is used
444
445
Split libgit.a out to a separate git-std-lib tor easier reuse.
446
@@ -629,29 +448,6 @@ Release tarballs are available at:
448
source: <cover.1696021277.git.jonathantanmy@google.com>
449
450
632
-* js/merge-base-with-missing-commit (2024-02-29) 11 commits
633
- (merged to 'next' on 2024-03-01 at 3e3eabaee9)
634
- + commit-reach(repo_get_merge_bases_many_dirty): pass on errors
635
- + commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors
636
- + commit-reach(get_octopus_merge_bases): pass on "missing commits" errors
637
- + commit-reach(repo_get_merge_bases): pass on "missing commits" errors
638
- + commit-reach(get_merge_bases_many_0): pass on "missing commits" errors
639
- + commit-reach(merge_bases_many): pass on "missing commits" errors
640
- + commit-reach(paint_down_to_common): start reporting errors
641
- + commit-reach(paint_down_to_common): prepare for handling shallow commits
642
- + commit-reach(repo_in_merge_bases_many): report missing commits
643
- + commit-reach(repo_in_merge_bases_many): optionally expect missing commits
644
- + commit-reach(paint_down_to_common): plug two memory leaks
645
-
646
- Originally merged to 'next' on 2024-02-29
647
-
648
- Make sure failure return from merge_bases_many() is properly caught.
649
-
650
- Needs an incremental fix-up.
651
- cf.<20240301065805.GB2680308@coredump.intra.peff.net>
652
- source: <pull.1657.v4.git.1709113457.gitgitgadget@gmail.com>
653
-
654
-
451
* rj/complete-worktree-paths-fix (2024-02-27) 1 commit
452
(merged to 'next' on 2024-03-06 at b6ba949383)
453
+ completion: fix __git_complete_worktree_paths
@@ -664,26 +460,14 @@ Release tarballs are available at:
460
source: <b8f09e20-d0d3-4e0b-afe2-31affeb61052@gmail.com>
461
462
667
-* rs/t-ctype-simplify (2024-03-03) 4 commits
668
- (merged to 'next' on 2024-03-04 at 9bd84a8877)
669
- + t-ctype: avoid duplicating class names
670
- + t-ctype: align output of i
671
- + t-ctype: simplify EOF check
672
- + t-ctype: allow NUL anywhere in the specification string
673
-
674
- Code simplification to one unit-test program.
675
-
676
- Will merge to 'master'.
677
- source: <20240303101330.20187-1-l.s.r@web.de>
678
-
679
-
463
* pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit
681
- - rebase -i: stop setting GIT_CHERRY_PICK_HELP
464
+ (merged to 'next' on 2024-03-08 at e806ee9493)
465
+ + rebase -i: stop setting GIT_CHERRY_PICK_HELP
466
467
Code simplification by getting rid of code that sets an environment
468
variable that is no longer used.
469
686
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
source: <pull.1678.git.1709042783847.gitgitgadget@gmail.com>
472
473
@@ -870,40 +654,41 @@ Release tarballs are available at:
654
655
656
* eb/hash-transition (2023-10-02) 30 commits
873
- - t1016-compatObjectFormat: add tests to verify the conversion between objects
874
- - t1006: test oid compatibility with cat-file
875
- - t1006: rename sha1 to oid
876
- - test-lib: compute the compatibility hash so tests may use it
877
- - builtin/ls-tree: let the oid determine the output algorithm
878
- - object-file: handle compat objects in check_object_signature
879
- - tree-walk: init_tree_desc take an oid to get the hash algorithm
880
- - builtin/cat-file: let the oid determine the output algorithm
881
- - rev-parse: add an --output-object-format parameter
882
- - repository: implement extensions.compatObjectFormat
883
- - object-file: update object_info_extended to reencode objects
884
- - object-file-convert: convert commits that embed signed tags
885
- - object-file-convert: convert commit objects when writing
886
- - object-file-convert: don't leak when converting tag objects
887
- - object-file-convert: convert tag objects when writing
888
- - object-file-convert: add a function to convert trees between algorithms
889
- - object: factor out parse_mode out of fast-import and tree-walk into in object.h
890
- - cache: add a function to read an OID of a specific algorithm
891
- - tag: sign both hashes
892
- - commit: export add_header_signature to support handling signatures on tags
893
- - commit: convert mergetag before computing the signature of a commit
894
- - commit: write commits for both hashes
895
- - object-file: add a compat_oid_in parameter to write_object_file_flags
896
- - object-file: update the loose object map when writing loose objects
897
- - loose: compatibilty short name support
898
- - loose: add a mapping between SHA-1 and SHA-256 for loose objects
899
- - repository: add a compatibility hash algorithm
900
- - object-names: support input of oids in any supported hash
901
- - oid-array: teach oid-array to handle multiple kinds of oids
902
- - object-file-convert: stubs for converting from one object format to another
657
+ (merged to 'next' on 2024-03-11 at 9cff2e4ab7)
658
+ + t1016-compatObjectFormat: add tests to verify the conversion between objects
659
+ + t1006: test oid compatibility with cat-file
660
+ + t1006: rename sha1 to oid
661
+ + test-lib: compute the compatibility hash so tests may use it
662
+ + builtin/ls-tree: let the oid determine the output algorithm
663
+ + object-file: handle compat objects in check_object_signature
664
+ + tree-walk: init_tree_desc take an oid to get the hash algorithm
665
+ + builtin/cat-file: let the oid determine the output algorithm
666
+ + rev-parse: add an --output-object-format parameter
667
+ + repository: implement extensions.compatObjectFormat
668
+ + object-file: update object_info_extended to reencode objects
669
+ + object-file-convert: convert commits that embed signed tags
670
+ + object-file-convert: convert commit objects when writing
671
+ + object-file-convert: don't leak when converting tag objects
672
+ + object-file-convert: convert tag objects when writing
673
+ + object-file-convert: add a function to convert trees between algorithms
674
+ + object: factor out parse_mode out of fast-import and tree-walk into in object.h
675
+ + cache: add a function to read an OID of a specific algorithm
676
+ + tag: sign both hashes
677
+ + commit: export add_header_signature to support handling signatures on tags
678
+ + commit: convert mergetag before computing the signature of a commit
679
+ + commit: write commits for both hashes
680
+ + object-file: add a compat_oid_in parameter to write_object_file_flags
681
+ + object-file: update the loose object map when writing loose objects
682
+ + loose: compatibilty short name support
683
+ + loose: add a mapping between SHA-1 and SHA-256 for loose objects
684
+ + repository: add a compatibility hash algorithm
685
+ + object-names: support input of oids in any supported hash
686
+ + oid-array: teach oid-array to handle multiple kinds of oids
687
+ + object-file-convert: stubs for converting from one object format to another
688
689
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
690
906
- Will merge to and cook in 'next'.
691
+ Will cook in 'next'.
692
cf. <xmqqv86z5359.fsf@gitster.g>
693
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
694