What's cooking (2023/10 #01)
Junio C Hamano committed
Oct 2, 2023 at 15:27 UTC
d8ea3e7a34ac2e74972b62236866d9edf8b58524
1 file changed
+221
-210
whats-cooking.txt
+221
-210
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2023, #09; Thu, 28)
3
-X-master-at: bcb6cae2966cc407ca1afc77413b3ef11103c175
4
-X-next-at: bb76f4660628719c052ba326e360fb0c84258b3c
2
+Subject: What's cooking in git.git (Oct 2023, #01; Mon, 2)
3
+X-master-at: d0e8084c65cbf949038ae4cc344ac2c2efd77415
4
+X-next-at: 2d36e41d1a24beaf57bc0d7146d2b0ae93a5d61b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2023, #09; Thu, 28)
7
+What's cooking in git.git (Oct 2023, #01; Mon, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,9 +45,175 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* ds/stat-name-width-configuration (2023-09-18) 1 commit
52
+ (merged to 'next' on 2023-09-22 at dbf5bd96e8)
53
+ + diff --stat: add config option to limit filename width
54
+
55
+ "git diff" learned diff.statNameWidth configuration variable, to
56
+ give the default width for the name part in the "--stat" output.
57
+ source: <87badb12f040d1c66cd9b89074d3de5015a45983.1694446743.git.dsimic@manjaro.org>
58
+
59
+
60
+* hy/doc-show-is-like-log-not-diff-tree (2023-09-20) 1 commit
61
+ (merged to 'next' on 2023-09-22 at 5492c03eae)
62
+ + show doc: redirect user to git log manual instead of git diff-tree
63
+
64
+ Doc update.
65
+ source: <20230920132731.1259-1-hanyang.tony@bytedance.com>
66
+
67
+
68
+* jc/alias-completion (2023-09-20) 1 commit
69
+ (merged to 'next' on 2023-09-22 at 1d069e900b)
70
+ + completion: loosen and document the requirement around completing alias
71
+
72
+ The command line completion script (in contrib/) can be told to
73
+ complete aliases by including ": git <cmd> ;" in the alias to tell
74
+ it that the alias should be completed similar to how "git <cmd>" is
75
+ completed. The parsing code for the alias as been loosened to
76
+ allow ';' without an extra space before it.
77
+ cf. <owlyjzssjro2.fsf@fine.c.googlers.com>
78
+ source: <xmqqy1h08zsp.fsf_-_@gitster.g>
79
+
80
+
81
+* jc/unresolve-removal (2023-07-31) 7 commits
82
+ (merged to 'next' on 2023-09-25 at 0563c8d8a1)
83
+ + checkout: allow "checkout -m path" to unmerge removed paths
84
+ + checkout/restore: add basic tests for --merge
85
+ + checkout/restore: refuse unmerging paths unless checking out of the index
86
+ + update-index: remove stale fallback code for "--unresolve"
87
+ + update-index: use unmerge_index_entry() to support removal
88
+ + resolve-undo: allow resurrecting conflicted state that resolved to deletion
89
+ + update-index: do not read HEAD and MERGE_HEAD unconditionally
90
+ (this branch is used by jc/rerere-cleanup.)
91
+
92
+ "checkout --merge -- path" and "update-index --unresolve path" did
93
+ not resurrect conflicted state that was resolved to remove path,
94
+ but now they do.
95
+ source: <20230731224409.4181277-1-gitster@pobox.com>
96
+
97
+
98
+* jk/fsmonitor-unused-parameter (2023-09-18) 8 commits
99
+ (merged to 'next' on 2023-09-19 at bd06505f9e)
100
+ + run-command: mark unused parameters in start_bg_wait callbacks
101
+ + fsmonitor: mark unused hashmap callback parameters
102
+ + fsmonitor/darwin: mark unused parameters in system callback
103
+ + fsmonitor: mark unused parameters in stub functions
104
+ + fsmonitor/win32: mark unused parameter in fsm_os__incompatible()
105
+ + fsmonitor: mark some maybe-unused parameters
106
+ + fsmonitor/win32: drop unused parameters
107
+ + fsmonitor: prefer repo_git_path() to git_pathdup()
108
+
109
+ Unused parameters in fsmonitor related code paths have been marked
110
+ as such.
111
+ source: <20230918222908.GA2659096@coredump.intra.peff.net>
112
+
113
+
114
+* jk/test-pass-ubsan-options-to-http-test (2023-09-21) 1 commit
115
+ (merged to 'next' on 2023-09-22 at bbe2f75937)
116
+ + test-lib: set UBSAN_OPTIONS to match ASan
117
+
118
+ UBSAN options were not propagated through the test framework to git
119
+ run via the httpd, unlike ASAN options, which has been corrected.
120
+ source: <20230921041825.GA2814583@coredump.intra.peff.net>
121
+
122
+
123
+* js/doc-status-with-submodules-mark-up-fix (2023-09-22) 1 commit
124
+ (merged to 'next' on 2023-09-25 at 7ed318fc91)
125
+ + Documentation/git-status: add missing line breaks
126
+
127
+ Docfix.
128
+ source: <pull.1590.git.1695392082207.gitgitgadget@gmail.com>
129
+
130
+
131
+* kh/range-diff-notes (2023-09-19) 1 commit
132
+ (merged to 'next' on 2023-09-22 at ac04978b4b)
133
+ + range-diff: treat notes like `log`
134
+
135
+ "git range-diff --notes=foo" compared "log --notes=foo --notes" of
136
+ the two ranges, instead of using just the specified notes tree.
137
+ source: <6e114271a2e7d2323193bd58bb307f60101942ce.1695154855.git.code@khaugsbakk.name>
138
+
139
+
140
+* ml/git-gui-exec-path-fix (2023-09-18) 3 commits
141
+ (merged to 'next' on 2023-09-19 at 0565b0b14b)
142
+ + Merge git-gui into ml/git-gui-exec-path-fix
143
+ + git-gui - use git-hook, honor core.hooksPath
144
+ + git-gui - re-enable use of hook scripts
145
+
146
+ Fix recent regression in Git-GUI that fails to run hook scripts at
147
+ all.
148
+
149
+
150
+* ob/am-msgfix (2023-09-21) 1 commit
151
+ (merged to 'next' on 2023-09-22 at 7f7589a06a)
152
+ + am: fix error message in parse_opt_show_current_patch()
153
+
154
+ The parameters to generate an error message have been corrected.
155
+ source: <20230921110727.789156-1-oswald.buddenhagen@gmx.de>
156
+
157
--------------------------------------------------
158
[New Topics]
159
160
+* cw/prelim-cleanup (2023-09-29) 4 commits
161
+ - parse: separate out parsing functions from config.h
162
+ - config: correct bad boolean env value error message
163
+ - wrapper: reduce scope of remove_or_warn()
164
+ - hex-ll: separate out non-hash-algo functions
165
+
166
+ Shuffle some bits across headers and sources to prepare for
167
+ libification effort.
168
+
169
+ Will merge to 'next'.
170
+ source: <cover.1696021277.git.jonathantanmy@google.com>
171
+
172
+
173
+* ds/init-diffstat-width (2023-09-29) 1 commit
174
+ - diff --stat: set the width defaults in a helper function
175
+
176
+ Code clean-up.
177
+
178
+ Will merge to 'next'.
179
+ source: <d45d1dac1a20699e370905b88b6fd0ec296751e7.1695441501.git.dsimic@manjaro.org>
180
+
181
+
182
+* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
183
+ - diff: fix --merge-base with annotated tags
184
+
185
+ source: <20231001151845.3621551-1-hi@alyssa.is>
186
+
187
+--------------------------------------------------
188
+[Stalled]
189
+
190
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
191
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
192
+
193
+ "git cherry-pick A" that replays a single commit stopped before
194
+ clobbering local modification, but "git cherry-pick A..B" did not,
195
+ which has been corrected.
196
+
197
+ Expecting a reroll.
198
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
199
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
200
+
201
+
202
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
203
+ - diff-lib: fix check_removed() when fsmonitor is active
204
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
205
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
206
+ (this branch uses jc/fake-lstat.)
207
+
208
+ The optimization based on fsmonitor in the "diff --cached"
209
+ codepath is resurrected with the "fake-lstat" introduced earlier.
210
+
211
+ It is unknown if the optimization is worth resurrecting, but in case...
212
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
213
+
214
+--------------------------------------------------
215
+[Cooking]
216
+
217
* bb/unicode-width-table-15 (2023-09-25) 1 commit
218
(merged to 'next' on 2023-09-28 at bb76f46606)
219
+ unicode: update the width tables to Unicode 15.1
@@ -60,13 +226,14 @@ Release tarballs are available at:
226
227
228
* eb/limit-bulk-checkin-to-blobs (2023-09-26) 1 commit
63
- - bulk-checkin: only support blobs in index_bulk_checkin
229
+ (merged to 'next' on 2023-10-02 at 89c9c95966)
230
+ + bulk-checkin: only support blobs in index_bulk_checkin
231
232
The "streaming" interface used for bulk-checkin codepath has been
233
narrowed to take only blob objects for now, with no real loss of
234
functionality.
235
69
- Will merge to 'next'.
236
+ Will merge to 'master'.
237
source: <87msx99b9o.fsf_-_@gmail.froward.int.ebiederm.org>
238
239
@@ -110,43 +277,43 @@ Release tarballs are available at:
277
source: <pull.1563.v4.git.1695709372.gitgitgadget@gmail.com>
278
279
113
-* eb/hash-transition (2023-09-27) 30 commits
114
- - t1016-compatObjectFormat: Add tests to verify the conversion between objects
115
- - t1006: Test oid compatibility with cat-file
116
- - t1006: Rename sha1 to oid
117
- - test-lib: Compute the compatibility hash so tests may use it
118
- - builtin/ls-tree: Let the oid determine the output algorithm
119
- - object-file: Handle compat objects in check_object_signature
280
+* eb/hash-transition (2023-10-02) 30 commits
281
+ - t1016-compatObjectFormat: add tests to verify the conversion between objects
282
+ - t1006: test oid compatibility with cat-file
283
+ - t1006: rename sha1 to oid
284
+ - test-lib: compute the compatibility hash so tests may use it
285
+ - builtin/ls-tree: let the oid determine the output algorithm
286
+ - object-file: handle compat objects in check_object_signature
287
- tree-walk: init_tree_desc take an oid to get the hash algorithm
121
- - builtin/cat-file: Let the oid determine the output algorithm
122
- - rev-parse: Add an --output-object-format parameter
123
- - repository: Implement extensions.compatObjectFormat
124
- - object-file: Update object_info_extended to reencode objects
125
- - object-file-convert: Convert commits that embed signed tags
288
+ - builtin/cat-file: let the oid determine the output algorithm
289
+ - rev-parse: add an --output-object-format parameter
290
+ - repository: implement extensions.compatObjectFormat
291
+ - object-file: update object_info_extended to reencode objects
292
+ - object-file-convert: convert commits that embed signed tags
293
- object-file-convert: convert commit objects when writing
127
- - object-file-convert: Don't leak when converting tag objects
294
+ - object-file-convert: don't leak when converting tag objects
295
- object-file-convert: convert tag objects when writing
296
- object-file-convert: add a function to convert trees between algorithms
130
- - object: Factor out parse_mode out of fast-import and tree-walk into in object.h
297
+ - object: factor out parse_mode out of fast-import and tree-walk into in object.h
298
- cache: add a function to read an OID of a specific algorithm
299
- tag: sign both hashes
133
- - commit: Export add_header_signature to support handling signatures on tags
134
- - commit: Convert mergetag before computing the signature of a commit
300
+ - commit: export add_header_signature to support handling signatures on tags
301
+ - commit: convert mergetag before computing the signature of a commit
302
- commit: write commits for both hashes
136
- - object-file: Add a compat_oid_in parameter to write_object_file_flags
137
- - object-file: Update the loose object map when writing loose objects
138
- - loose: Compatibilty short name support
303
+ - object-file: add a compat_oid_in parameter to write_object_file_flags
304
+ - object-file: update the loose object map when writing loose objects
305
+ - loose: compatibilty short name support
306
- loose: add a mapping between SHA-1 and SHA-256 for loose objects
307
- repository: add a compatibility hash algorithm
141
- - object-names: Support input of oids in any supported hash
142
- - oid-array: Teach oid-array to handle multiple kinds of oids
143
- - object-file-convert: Stubs for converting from one object format to another
308
+ - object-names: support input of oids in any supported hash
309
+ - oid-array: teach oid-array to handle multiple kinds of oids
310
+ - object-file-convert: stubs for converting from one object format to another
311
312
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
313
314
Breaks a few CI jobs when merged to 'seen'.
315
cf. <xmqqbkdmjbkp.fsf@gitster.g>
149
- source: <87jzsbjt0a.fsf@gmail.froward.int.ebiederm.org>
316
+ source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
317
318
319
* xz/commit-title-soft-limit-doc (2023-09-28) 1 commit
@@ -158,35 +325,6 @@ Release tarballs are available at:
325
Will merge to 'master'.
326
source: <pull.1580.git.git.1695895155985.gitgitgadget@gmail.com>
327
161
---------------------------------------------------
162
-[Stalled]
163
-
164
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
165
- - cherry-pick: refuse cherry-pick sequence if index is dirty
166
-
167
- "git cherry-pick A" that replays a single commit stopped before
168
- clobbering local modification, but "git cherry-pick A..B" did not,
169
- which has been corrected.
170
-
171
- Expecting a reroll.
172
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
173
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
174
-
175
-
176
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
177
- - diff-lib: fix check_removed() when fsmonitor is active
178
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
179
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
180
- (this branch uses jc/fake-lstat.)
181
-
182
- The optimization based on fsmonitor in the "diff --cached"
183
- codepath is resurrected with the "fake-lstat" introduced earlier.
184
-
185
- It is unknown if the optimization is worth resurrecting, but in case...
186
- source: <xmqqr0n0h0tw.fsf@gitster.g>
187
-
188
---------------------------------------------------
189
-[Cooking]
328
329
* jx/remote-archive-over-smart-http (2023-09-25) 3 commits
330
- archive: support remote archive from stateless transport
@@ -239,59 +377,14 @@ Release tarballs are available at:
377
378
379
* ty/merge-tree-strategy-options (2023-09-25) 1 commit
242
- - merge-tree: add -X strategy option
380
+ (merged to 'next' on 2023-09-29 at aa65b54416)
381
+ + merge-tree: add -X strategy option
382
383
"git merge-tree" learned to take strategy backend specific options
384
via the "-X" option, like "git merge" does.
385
247
- Will merge to 'next'.
248
- source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
249
-
250
-
251
-* hy/doc-show-is-like-log-not-diff-tree (2023-09-20) 1 commit
252
- (merged to 'next' on 2023-09-22 at 5492c03eae)
253
- + show doc: redirect user to git log manual instead of git diff-tree
254
-
255
- Doc update.
256
-
257
- Will merge to 'master'.
258
- source: <20230920132731.1259-1-hanyang.tony@bytedance.com>
259
-
260
-
261
-* jc/alias-completion (2023-09-20) 1 commit
262
- (merged to 'next' on 2023-09-22 at 1d069e900b)
263
- + completion: loosen and document the requirement around completing alias
264
-
265
- The command line completion script (in contrib/) can be told to
266
- complete aliases by including ": git <cmd> ;" in the alias to tell
267
- it that the alias should be completed similar to how "git <cmd>" is
268
- completed. The parsing code for the alias as been loosened to
269
- allow ';' without an extra space before it.
270
-
271
- Will merge to 'master'.
272
- cf. <owlyjzssjro2.fsf@fine.c.googlers.com>
273
- source: <xmqqy1h08zsp.fsf_-_@gitster.g>
274
-
275
-
276
-* jk/test-pass-ubsan-options-to-http-test (2023-09-21) 1 commit
277
- (merged to 'next' on 2023-09-22 at bbe2f75937)
278
- + test-lib: set UBSAN_OPTIONS to match ASan
279
-
280
- UBSAN options were not propagated through the test framework to git
281
- run via the httpd, unlike ASAN options, which has been corrected.
282
-
386
Will merge to 'master'.
284
- source: <20230921041825.GA2814583@coredump.intra.peff.net>
285
-
286
-
287
-* ob/am-msgfix (2023-09-21) 1 commit
288
- (merged to 'next' on 2023-09-22 at 7f7589a06a)
289
- + am: fix error message in parse_opt_show_current_patch()
290
-
291
- The parameters to generate an error message have been corrected.
292
-
293
- Will merge to 'master'.
294
- source: <20230921110727.789156-1-oswald.buddenhagen@gmx.de>
387
+ source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
388
389
390
* js/ci-coverity (2023-09-25) 7 commits
@@ -309,16 +402,6 @@ Release tarballs are available at:
402
source: <pull.1588.v2.git.1695642662.gitgitgadget@gmail.com>
403
404
312
-* js/doc-status-with-submodules-mark-up-fix (2023-09-22) 1 commit
313
- (merged to 'next' on 2023-09-25 at 7ed318fc91)
314
- + Documentation/git-status: add missing line breaks
315
-
316
- Docfix.
317
-
318
- Will merge to 'master'.
319
- source: <pull.1590.git.1695392082207.gitgitgadget@gmail.com>
320
-
321
-
405
* js/config-parse (2023-09-21) 5 commits
406
- config-parse: split library out of config.[c|h]
407
- config.c: accept config_parse_options in git_config_from_stdin
@@ -331,47 +414,6 @@ Release tarballs are available at:
414
source: <cover.1695330852.git.steadmon@google.com>
415
416
334
-* ml/git-gui-exec-path-fix (2023-09-18) 3 commits
335
- (merged to 'next' on 2023-09-19 at 0565b0b14b)
336
- + Merge git-gui into ml/git-gui-exec-path-fix
337
- + git-gui - use git-hook, honor core.hooksPath
338
- + git-gui - re-enable use of hook scripts
339
-
340
- Fix recent regression in Git-GUI that fails to run hook scripts at
341
- all.
342
-
343
- Will merge to 'master'.
344
-
345
-
346
-* ds/stat-name-width-configuration (2023-09-18) 1 commit
347
- (merged to 'next' on 2023-09-22 at dbf5bd96e8)
348
- + diff --stat: add config option to limit filename width
349
-
350
- "git diff" learned diff.statNameWidth configuration variable, to
351
- give the default width for the name part in the "--stat" output.
352
-
353
- Will merge to 'master'.
354
- source: <87badb12f040d1c66cd9b89074d3de5015a45983.1694446743.git.dsimic@manjaro.org>
355
-
356
-
357
-* jk/fsmonitor-unused-parameter (2023-09-18) 8 commits
358
- (merged to 'next' on 2023-09-19 at bd06505f9e)
359
- + run-command: mark unused parameters in start_bg_wait callbacks
360
- + fsmonitor: mark unused hashmap callback parameters
361
- + fsmonitor/darwin: mark unused parameters in system callback
362
- + fsmonitor: mark unused parameters in stub functions
363
- + fsmonitor/win32: mark unused parameter in fsm_os__incompatible()
364
- + fsmonitor: mark some maybe-unused parameters
365
- + fsmonitor/win32: drop unused parameters
366
- + fsmonitor: prefer repo_git_path() to git_pathdup()
367
-
368
- Unused parameters in fsmonitor related code paths have been marked
369
- as such.
370
-
371
- Will merge to 'master'.
372
- source: <20230918222908.GA2659096@coredump.intra.peff.net>
373
-
374
-
417
* jc/fake-lstat (2023-09-15) 1 commit
418
- cache: add fake_lstat()
419
(this branch is used by jc/diff-cached-fsmonitor-fix.)
@@ -395,17 +437,6 @@ Release tarballs are available at:
437
source: <20230920104507.21664-1-karthik.188@gmail.com>
438
439
398
-* kh/range-diff-notes (2023-09-19) 1 commit
399
- (merged to 'next' on 2023-09-22 at ac04978b4b)
400
- + range-diff: treat notes like `log`
401
-
402
- "git range-diff --notes=foo" compared "log --notes=foo --notes" of
403
- the two ranges, instead of using just the specified notes tree.
404
-
405
- Will merge to 'master'.
406
- source: <6e114271a2e7d2323193bd58bb307f60101942ce.1695154855.git.code@khaugsbakk.name>
407
-
408
-
440
* rs/parse-options-value-int (2023-09-18) 2 commits
441
- parse-options: use and require int pointer for OPT_CMDMODE
442
- parse-options: add int value pointer to struct option
@@ -428,8 +459,7 @@ Release tarballs are available at:
459
source: <20230909125446.142715-1-sorganov@gmail.com>
460
461
431
-* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-25) 10 commits
432
- - SQUASH??? t0080 is already taken
462
+* cc/repack-sift-filtered-objects-to-separate-pack (2023-10-02) 9 commits
463
- gc: add `gc.repackFilterTo` config option
464
- repack: implement `--filter-to` for storing filtered out objects
465
- gc: add `gc.repackFilter` config option
@@ -443,8 +473,9 @@ Release tarballs are available at:
473
"git repack" machinery learns to pay attention to the "--filter="
474
option.
475
446
- Looking better.
447
- source: <20230925152517.803579-1-christian.couder@gmail.com>
476
+ Will merge to 'next'.
477
+ cf. <ZRsknb4NxNHTR21E@nand.local>
478
+ source: <20231002165504.1325153-1-christian.couder@gmail.com>
479
480
481
* pw/rebase-sigint (2023-09-07) 1 commit
@@ -462,23 +493,6 @@ Release tarballs are available at:
493
source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
494
495
465
-* cw/git-std-lib (2023-09-11) 7 commits
466
- - SQUASH???
467
- - git-std-lib: add test file to call git-std-lib.a functions
468
- - git-std-lib: introduce git standard library
469
- - parse: create new library for parsing strings and env values
470
- - config: correct bad boolean env value error message
471
- - wrapper: remove dependency to Git-specific internal file
472
- - hex-ll: split out functionality from hex
473
-
474
- Another libification effort.
475
-
476
- Needs more work.
477
- cf. <xmqqy1hfrk6p.fsf@gitster.g>
478
- cf. <20230915183927.1597414-1-jonathantanmy@google.com>
479
- source: <20230908174134.1026823-1-calvinwan@google.com>
480
-
481
-
496
* cc/git-replay (2023-09-07) 15 commits
497
- replay: stop assuming replayed branches do not diverge
498
- replay: add --contained to rebase contained branches
@@ -585,31 +599,11 @@ Release tarballs are available at:
599
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error
600
- rerere: fix comment on handle_file() helper
601
- rerere: simplify check_one_conflict() helper function
588
- (this branch uses jc/unresolve-removal.)
602
603
Code clean-up.
604
605
Not ready to be reviewed yet.
593
- source: <20230731224409.4181277-1-gitster@pobox.com>
594
-
595
-
596
-* jc/unresolve-removal (2023-07-31) 7 commits
597
- (merged to 'next' on 2023-09-25 at 0563c8d8a1)
598
- + checkout: allow "checkout -m path" to unmerge removed paths
599
- + checkout/restore: add basic tests for --merge
600
- + checkout/restore: refuse unmerging paths unless checking out of the index
601
- + update-index: remove stale fallback code for "--unresolve"
602
- + update-index: use unmerge_index_entry() to support removal
603
- + resolve-undo: allow resurrecting conflicted state that resolved to deletion
604
- + update-index: do not read HEAD and MERGE_HEAD unconditionally
605
- (this branch is used by jc/rerere-cleanup.)
606
-
607
- "checkout --merge -- path" and "update-index --unresolve path" did
608
- not resurrect conflicted state that was resolved to remove path,
609
- but now they do.
610
-
611
- Will merge to 'master'.
612
- source: <20230731224409.4181277-1-gitster@pobox.com>
606
+ source: <20230824205456.1231371-1-gitster@pobox.com>
607
608
609
* rj/status-bisect-while-rebase (2023-08-01) 1 commit
@@ -632,3 +626,20 @@ Release tarballs are available at:
626
627
Superseded by the js/ci-coverity topic.
628
source: <b23951c569660e1891a7fb3ad2c2ea1952897bd7.1695332105.git.me@ttaylorr.com>
629
+
630
+
631
+* cw/git-std-lib (2023-09-11) 7 commits
632
+ . SQUASH???
633
+ . git-std-lib: add test file to call git-std-lib.a functions
634
+ . git-std-lib: introduce git standard library
635
+ . parse: create new library for parsing strings and env values
636
+ . config: correct bad boolean env value error message
637
+ . wrapper: remove dependency to Git-specific internal file
638
+ . hex-ll: split out functionality from hex
639
+
640
+ Another libification effort.
641
+
642
+ Superseded by the cw/prelim-cleanup topic.
643
+ cf. <xmqqy1hfrk6p.fsf@gitster.g>
644
+ cf. <20230915183927.1597414-1-jonathantanmy@google.com>
645
+ source: <20230908174134.1026823-1-calvinwan@google.com>