What's cooking (2023/03 #05)
Junio C Hamano committed
Mar 22, 2023 at 15:53 UTC
8766ea31f37a232875cd9283f0ccc25f1a47a6d8
1 file changed
+452
-448
whats-cooking.txt
+452
-448
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2023, #04; Fri, 17)
3
-X-master-at: 950264636c68591989456e3ba0a5442f93152c1a
4
-X-next-at: d9ab777d41f92a8c1684c91cfb02053d7dd1046b
2
+Subject: What's cooking in git.git (Mar 2023, #05; Wed, 22)
3
+X-master-at: 27d43aaaf50ef0ae014b88bba294f93658016a2e
4
+X-next-at: c903bb7e22f8f86da64de537e5768ab0ca886f4b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2023, #04; Fri, 17)
7
+What's cooking in git.git (Mar 2023, #05; Wed, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,7 +16,7 @@ message that raises issues but they are no means exhaustive. A
16
topic without enough support may be discarded after a long period of
17
no activity.
18
19
-The first batch of topics are in 'master' for the next feature
19
+The first two batches of topics are in 'master' for the next feature
20
release, and the tip of 'maint' now points at Git 2.40.0 to start
21
another maintenance track.
22
@@ -51,265 +51,382 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
54
-* en/dir-api-cleanup (2023-02-27) 13 commits
55
- (merged to 'next' on 2023-02-27 at 434ac6b592)
56
- + unpack-trees: add usage notices around df_conflict_entry
57
- + unpack-trees: special case read-tree debugging as internal usage
58
- + unpack-trees: rewrap a few overlong lines from previous patch
59
- + unpack-trees: mark fields only used internally as internal
60
- + unpack_trees: start splitting internal fields from public API
61
- + sparse-checkout: avoid using internal API of unpack-trees, take 2
62
- + sparse-checkout: avoid using internal API of unpack-trees
63
- + unpack-trees: clean up some flow control
64
- + dir: mark output only fields of dir_struct as such
65
- + dir: add a usage note to exclude_per_dir
66
- + dir: separate public from internal portion of dir_struct
67
- + unpack-trees: heed requests to overwrite ignored files
68
- + t2021: fix platform-specific leftover cruft
69
-
70
- Code clean-up to clarify directory traversal API.
71
- source: <pull.1149.v3.git.1677511700.gitgitgadget@gmail.com>
72
-
73
-
74
-* en/header-cleanup (2023-02-23) 17 commits
75
- (merged to 'next' on 2023-02-27 at f4a3707530)
76
- + diff.h: remove unnecessary include of object.h
77
- + Remove unnecessary includes of builtin.h
78
- + treewide: replace cache.h with more direct headers, where possible
79
- + replace-object.h: move read_replace_refs declaration from cache.h to here
80
- + object-store.h: move struct object_info from cache.h
81
- + dir.h: refactor to no longer need to include cache.h
82
- + object.h: stop depending on cache.h; make cache.h depend on object.h
83
- + ident.h: move ident-related declarations out of cache.h
84
- + pretty.h: move has_non_ascii() declaration from commit.h
85
- + cache.h: remove dependence on hex.h; make other files include it explicitly
86
- + hex.h: move some hex-related declarations from cache.h
87
- + hash.h: move some oid-related declarations from cache.h
88
- + alloc.h: move ALLOC_GROW() functions from cache.h
89
- + treewide: remove unnecessary cache.h includes in source files
90
- + treewide: remove unnecessary cache.h includes
91
- + treewide: remove unnecessary git-compat-util.h includes in headers
92
- + treewide: ensure one of the appropriate headers is sourced first
93
-
94
- Code clean-up to clarify the rule that "git-compat-util.h" must be
95
- the first to be included.
96
- source: <pull.1485.v2.git.1677197376.gitgitgadget@gmail.com>
97
-
98
-
99
-* ew/fetch-hiderefs (2023-02-27) 1 commit
100
- (merged to 'next' on 2023-03-01 at 6a7eece733)
101
- + fetch: support hideRefs to speed up connectivity checks
102
-
103
- A new "fetch.hideRefs" option can be used to exclude specified refs
104
- from "rev-list --objects --stdin --not --all" traversal for
105
- checking object connectivity, most useful when there are many
106
- unrelated histories in a single repository.
107
- source: <20230212090426.M558990@dcvr>
108
-
109
-
110
-* fz/rebase-msg-update (2023-02-27) 1 commit
111
- (merged to 'next' on 2023-03-01 at f28c0df111)
112
- + rebase: fix capitalisation autoSquash in i18n string
113
-
114
- Message update.
115
- source: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com>
116
-
117
-
118
-* jc/gpg-lazy-init (2023-02-27) 2 commits
119
- (merged to 'next' on 2023-02-27 at e3f81cfdbc)
120
- + drop pure pass-through config callbacks
121
- + gpg-interface: lazily initialize and read the configuration
122
-
123
- Instead of forcing each command to choose to honor GPG related
124
- configuration variables, make the subsystem lazily initialize
125
- itself.
126
- source: <xmqqpmaimvtd.fsf_-_@gitster.g>
127
-
128
-
129
-* jk/fsck-indices-in-worktrees (2023-02-27) 4 commits
130
- (merged to 'next' on 2023-02-27 at 6eb92abb6b)
131
- + fsck: check even zero-entry index files
132
- (merged to 'next' on 2023-02-24 at 38c0793286)
133
- + fsck: mention file path for index errors
134
- + fsck: check index files in all worktrees
135
- + fsck: factor out index fsck
136
-
137
- "git fsck" learned to check the index files in other worktrees,
138
- just like "git gc" honors them as anchoring points.
139
- source: <Y/hv0MXAyBY3HEo9@coredump.intra.peff.net>
140
-
141
-
142
-* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
143
- (merged to 'next' on 2023-02-27 at f0ec2a81b3)
144
- + help: mark unused parameter in git_unknown_cmd_config()
145
- + run_processes_parallel: mark unused callback parameters
146
- + userformat_want_item(): mark unused parameter
147
- + for_each_commit_graft(): mark unused callback parameter
148
- + rewrite_parents(): mark unused callback parameter
149
- + fetch-pack: mark unused parameter in callback function
150
- + notes: mark unused callback parameters
151
- + prio-queue: mark unused parameters in comparison functions
152
- + for_each_object: mark unused callback parameters
153
- + list-objects: mark unused callback parameters
154
- + mark unused parameters in signal handlers
155
- + run-command: mark error routine parameters as unused
156
- + mark "pointless" data pointers in callbacks
157
- + ref-filter: mark unused callback parameters
158
- + http-backend: mark unused parameters in virtual functions
159
- + http-backend: mark argc/argv unused
160
- + object-name: mark unused parameters in disambiguate callbacks
161
- + serve: mark unused parameters in virtual functions
162
- + serve: use repository pointer to get config
163
- + ls-refs: drop config caching
164
- + ref-filter: drop unused atom parameter from get_worktree_path()
165
-
166
- More work towards -Wunused.
167
- source: <Y/habYJxDRJQg/kJ@coredump.intra.peff.net>
168
-
169
-
170
-* mc/credential-helper-www-authenticate (2023-02-27) 3 commits
171
- (merged to 'next' on 2023-02-27 at 89c9bd4b8f)
172
- + credential: add WWW-Authenticate header to cred requests
173
- + http: read HTTP WWW-Authenticate response headers
174
- + t5563: add tests for basic and anoymous HTTP access
175
-
176
- Allow information carried on the WWW-AUthenticate header to be
177
- passed to the credential helpers.
178
- source: <pull.1352.v11.git.1677518420.gitgitgadget@gmail.com>
54
+* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
55
+ (merged to 'next' on 2023-03-06 at 60d7d0d493)
56
+ + tests: don't lose misc "git" exit codes
57
+ + tests: don't lose exit status with "test <op> $(git ...)"
58
+ + tests: don't lose "git" exit codes in "! ( git ... | grep )"
59
+ + tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
60
+ + t/lib-patch-mode.sh: fix ignored exit codes
61
+ + auto-crlf tests: don't lose exit code in loops and outside tests
62
+
63
+ Test clean-up.
64
+ source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
65
+
66
+
67
+* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
68
+ (merged to 'next' on 2023-03-08 at bd9eff2779)
69
+ + sequencer.c: fix overflow & segfault in parse_strategy_opts()
70
+ (this branch is used by pw/rebase-cleanup-merge-strategy-option-handling.)
71
+
72
+ The code to parse "git rebase -X<opt>" was not prepared to see an
73
+ unparsable option string, which has been corrected.
74
+ source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
75
+
76
+
77
+* aj/ls-files-format-fix (2023-03-10) 1 commit
78
+ (merged to 'next' on 2023-03-13 at 27f876afa4)
79
+ + ls-files: fix "--format" output of relative paths
80
+
81
+ Fix for a "ls-files --format="%(path)" that produced nonsense
82
+ output, which was a bug in 2.38.
83
+ source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
84
+
85
+
86
+* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
87
+ (merged to 'next' on 2023-03-06 at 4ee341853c)
88
+ + restore: fault --staged --worktree with merge opts
89
+
90
+ "git restore" supports options like "--ours" that are only
91
+ meaningful during a conflicted merge, but these options are only
92
+ meaningful when updating the working tree files. These options are
93
+ marked to be incompatible when both "--staged" and "--worktree" are
94
+ in effect.
95
+ source: <20230226184354.221-1-andy.koppe@gmail.com>
96
+
97
+
98
+* as/doc-markup-fix (2023-03-06) 1 commit
99
+ (merged to 'next' on 2023-03-07 at 8c7289659a)
100
+ + git-merge-tree.txt: replace spurious HTML entity
101
+
102
+ Fix for a mis-mark-up in doc made in Git 2.39 days.
103
+ source: <87y1oco3i9.fsf@igel.home>
104
+
105
+
106
+* ds/reprepare-alternates-when-repreparing-packfiles (2023-03-09) 1 commit
107
+ (merged to 'next' on 2023-03-09 at 851bceed17)
108
+ + object-file: reprepare alternates when necessary
109
+
110
+ Once we start running, we assumed that the list of alternate object
111
+ databases would never change. Hook into the machinery used to
112
+ update the list of packfiles during runtime to update this list as
113
+ well.
114
+ source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
115
+
116
+
117
+* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
118
+ (merged to 'next' on 2023-03-06 at 5dc1c4c0b7)
119
+ + commit-reach: avoid NULL dereference
120
+
121
+ Fix a segfaulting loop. The function and its caller may need
122
+ further clean-up.
123
+ cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
124
+ source: <20230211111526.2028178-1-e@80x24.org>
125
+
126
+
127
+* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
128
+ (merged to 'next' on 2023-03-09 at 283e2159c8)
129
+ + fetch: pass --no-write-fetch-head to subprocesses
130
+
131
+ source: <20230308222205.M679514@dcvr>
132
+
133
+
134
+* fc/advice-diverged-history (2023-03-08) 1 commit
135
+ (merged to 'next' on 2023-03-08 at 30e7016218)
136
+ + advice: add diverging advice for novices
137
+
138
+ After "git pull" that is configured with pull.rebase=false
139
+ merge.ff=only fails due to our end having our own development, give
140
+ advice messages to get out of the "Not possible to fast-forward"
141
+ state.
142
+ source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
143
+
144
+
145
+* fc/test-aggregation-clean-up (2023-03-09) 2 commits
146
+ (merged to 'next' on 2023-03-13 at f938b09366)
147
+ + test: don't print aggregate-results command
148
+ + test: simplify counts aggregation
149
+
150
+ Code clean-up for test framework.
151
+ source: <20230309173032.959968-1-felipe.contreras@gmail.com>
152
+
153
+
154
+* jk/add-p-unmerged-fix (2023-03-09) 1 commit
155
+ (merged to 'next' on 2023-03-09 at a46443480c)
156
+ + add-patch: handle "* Unmerged path" lines
157
+
158
+ "git add -p" while the index is unmerged sometimes failed to parse
159
+ the diff output it internally produces and died, which has been
160
+ corrected.
161
+ source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
162
+
163
+
164
+* jk/bundle-progress (2023-03-06) 1 commit
165
+ (merged to 'next' on 2023-03-07 at 0df2b09e1b)
166
+ + bundle: turn on --all-progress-implied by default
167
+
168
+ Simplify UI to control progress meter given by "git bundle" command.
169
+ source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
170
+
171
+
172
+* jk/bundle-use-dash-for-stdfiles (2023-03-06) 5 commits
173
+ (merged to 'next' on 2023-03-07 at 8ceb58f725)
174
+ + parse-options: use prefix_filename_except_for_dash() helper
175
+ + parse-options: consistently allocate memory in fix_filename()
176
+ + bundle: don't blindly apply prefix_filename() to "-"
177
+ + bundle: document handling of "-" as stdin
178
+ + bundle: let "-" mean stdin for reading operations
179
+
180
+ "git bundle" learned that "-" is a common way to say that the input
181
+ comes from the standard input and/or the output goes to the
182
+ standard output. It used to work only for output and only from the
183
+ root level of the working tree.
184
+ source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
185
+
186
+
187
+* jk/format-patch-change-format-for-empty-commits (2023-03-03) 1 commit
188
+ (merged to 'next' on 2023-03-07 at 1c421f4a9f)
189
+ + format-patch: output header for empty commits
190
+
191
+ "git format-patch" learned to write a log-message only output file
192
+ for empty commits.
193
+ source: <20230303160301.3659328-1-john@keeping.me.uk>
194
+
195
+
196
+* jk/format-patch-ignore-noprefix (2023-03-13) 6 commits
197
+ (merged to 'next' on 2023-03-13 at 4b28e389f5)
198
+ + rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
199
+ (merged to 'next' on 2023-03-12 at 621d71c151)
200
+ + format-patch: add format.noprefix option
201
+ + format-patch: do not respect diff.noprefix
202
+ + diff: add --default-prefix option
203
+ + t4013: add tests for diff prefix options
204
+ + diff: factor out src/dst prefix setup
205
+
206
+ "git format-patch" honors the src/dst prefixes set to nonstandard
207
+ values with configuration variables like "diff.noprefix", causing
208
+ receiving end of the patch that expects the standard -p1 format to
209
+ break. Teach "format-patch" to ignore end-user configuration and
210
+ always use the standard prefixes.
211
+
212
+ This is a backward compatibility breaking change.
213
+ source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
214
+
215
+
216
+* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
217
+ (merged to 'next' on 2023-03-13 at 8d099dffcc)
218
+ + receive-pack: fix stale packfile locks when dying
219
+
220
+ "git receive-pack" that responds to "git push" requests failed to
221
+ clean a stale lockfile when killed in the middle, which has been
222
+ corrected.
223
+ source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
224
+
225
+
226
+* rj/avoid-switching-to-already-used-branch (2023-02-25) 4 commits
227
+ (merged to 'next' on 2023-03-06 at 7546231ddf)
228
+ + switch: reject if the branch is already checked out elsewhere (test)
229
+ + rebase: refuse to switch to a branch already checked out elsewhere (test)
230
+ + branch: fix die_if_checked_out() when ignore_current_worktree
231
+ + worktree: introduce is_shared_symref()
232
+
233
+ A few subcommands have been taught to stop users from working on a
234
+ branch that is being used in another worktree linked to the same
235
+ repository.
236
+ source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
237
+
238
+
239
+* rj/bisect-already-used-branch (2023-01-22) 1 commit
240
+ (merged to 'next' on 2023-03-06 at 3508814a41)
241
+ + bisect: fix "reset" when branch is checked out elsewhere
242
+
243
+ Allow "git bisect reset" to check out the original branch when the
244
+ branch is already checked out in a different worktree linked to the
245
+ same repository.
246
+ source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
247
+
248
+
249
+* zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
250
+ (merged to 'next' on 2023-03-06 at f08def5949)
251
+ + push: allow delete single-level ref
252
+ + receive-pack: fix funny ref error messsage
253
+
254
+ "git push" has been taught to allow deletion of refs with one-level
255
+ names to help repairing a repository who acquired such a ref by
256
+ mistake. In general, we don't encourage use of such a ref, and
257
+ creation or update to such a ref is rejected as before.
258
+ source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
259
260
--------------------------------------------------
261
[New Topics]
262
183
-* ar/test-cleanup-unused-file-creation (2023-03-13) 7 commits
184
- - t1507: assert output of rev-parse
185
- - t1404: don't create unused file
186
- - t1400: assert output of update-ref
187
- - t1302: don't create unused file
188
- - t1010: assert empty output of mktree
189
- - t1006: assert error output of cat-file
190
- - t1005: assert output of ls-files
263
+* jk/fix-proto-downgrade-to-v0 (2023-03-17) 1 commit
264
+ (merged to 'next' on 2023-03-21 at ed9e43d3ed)
265
+ + git_connect(): fix corner cases in downgrading v2 to v0
266
192
- Test clean-up.
267
+ Transports that do not support protocol v2 did not correctly fall
268
+ back to protocol v0 under certain conditions, which has been
269
+ corrected.
270
194
- Needs Review.
195
- source: <20230312201520.370234-1-rybak.a.v@gmail.com>
271
+ Will merge to 'master'.
272
+ source: <ZBS6wwWXcEBwGBm/@coredump.intra.peff.net>
273
274
198
-* nw/for-each-ref-signature (2023-03-13) 1 commit
199
- . ref-filter: add new "signature" atom
275
+* pe/time-use-gettimeofday (2023-03-21) 1 commit
276
+ (merged to 'next' on 2023-03-21 at 456b65b4c2)
277
+ + git-compat-util: use gettimeofday(2) for time(2)
278
201
- "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
202
- placeholder and friends.
279
+ time(2) on glib 2.31+, especially on Linux, goes out of sync with
280
+ higher resolution timers used for gettimeofday(2) and by the
281
+ filesystem. Replace all calls to it with a time_now() wrapper and
282
+ then use gettimeofday(2) in its implementation.
283
204
- Breaks CI.
205
- cf. <xmqqpm9bosjw.fsf@gitster.g>
206
- source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
284
+ Will merge to 'master'.
285
+ source: <20230320230507.3932018-1-gitster@pobox.com>
286
287
209
-* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
210
- - credential: new attribute oauth_refresh_token
288
+* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
289
+ - rebase -i: do not update "done" when rescheduling command
290
212
- The credential subsystem learns to help OAuth framework.
291
+ "rebase -i" moved a "rescheduled" insn in the todo file to the
292
+ "done" list before it completed, which has been corrected.
293
214
- Needs Review.
215
- source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
294
+ Expecting clarification.
295
+ source: <pull.1492.git.1679237337683.gitgitgadget@gmail.com>
296
297
218
-* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
219
- - credential/libsecret: support password_expiry_utc
298
+* pw/wildmatch-fixes (2023-03-20) 3 commits
299
+ - wildmatch: hide internal return values
300
+ - wildmatch: avoid undefined behavior
301
+ - wildmatch: fix exponential behavior
302
221
- The libsecret credential helper learns to handle the password
222
- expiry time information.
303
+ The wildmatch library code unlearns exponential behaviour it
304
+ acquired some time ago since it was borrowed from rsync.
305
224
- Needs Review.
225
- source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
306
+ Needs review.
307
+ source: <cover.1679328580.git.phillip.wood@dunelm.org.uk>
308
309
228
-* ps/fetch-ref-update-reporting (2023-03-15) 8 commits
229
- - fetch: centralize printing of reference updates
230
- - fetch: fix inconsistent summary width for pruned and updated refs
231
- - fetch: deduplicate logic to print remote URL
232
- - fetch: deduplicate handling of per-reference format
233
- - fetch: pass the full local reference name to `format_display`
234
- - fetch: move output format into `display_state`
235
- - fetch: move reference width calculation into `display_state`
236
- - fetch: rename `display` buffer to avoid name conflict
310
+* sg/parse-options-h-initializers (2023-03-20) 3 commits
311
+ - parse-options.h: use designated initializers in OPT_* macros
312
+ - parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
313
+ - parse-options.h: use consistent name for the callback parameters
314
238
- Clean-up of the code path that reports what "git fetch" did to each
239
- ref.
315
+ Code clean-up to use designated initializers in parse-options API.
316
241
- Will merge to 'next'??
242
- source: <cover.1678878623.git.ps@pks.im>
317
+ Will merge to 'next'.
318
+ source: <20230319165648.656738-1-szeder.dev@gmail.com>
319
320
245
-* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits
246
- - rebase: remove a couple of redundant strategy tests
247
- - rebase -m: fix serialization of strategy options
248
- - rebase -m: cleanup --strategy-option handling
249
- - rebase: stop reading and writing unnecessary strategy state
250
- - Merge branch 'ab/fix-strategy-opts-parsing'
251
- (this branch uses ab/fix-strategy-opts-parsing.)
321
+* sg/parse-options-h-users (2023-03-20) 2 commits
322
+ - treewide: remove unnecessary inclusions of parse-options.h from headers
323
+ - treewide: include parse-options.h in source files
324
253
- Clean-up of the code path that deals with merge strategy option
254
- handling in "git rebase".
325
+ Code clean-up to include and/or uninclude parse-options.h file as
326
+ needed.
327
256
- Needs review.
257
- source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
328
+ Will merge to 'next'.
329
+ source: <20230319162712.654137-1-szeder.dev@gmail.com>
330
331
260
-* ab/remove-implicit-use-of-the-repository (2023-03-17) 17 commits
261
- - libs: use "struct repository *" argument, not "the_repository"
262
- - post-cocci: adjust comments for recent repo_* migration
263
- - cocci: apply the "revision.h" part of "the_repository.pending"
264
- - cocci: apply the "rerere.h" part of "the_repository.pending"
265
- - cocci: apply the "refs.h" part of "the_repository.pending"
266
- - cocci: apply the "promisor-remote.h" part of "the_repository.pending"
267
- - cocci: apply the "packfile.h" part of "the_repository.pending"
268
- - cocci: apply the "pretty.h" part of "the_repository.pending"
269
- - cocci: apply the "object-store.h" part of "the_repository.pending"
270
- - cocci: apply the "diff.h" part of "the_repository.pending"
271
- - cocci: apply the "commit.h" part of "the_repository.pending"
272
- - cocci: apply the "commit-reach.h" part of "the_repository.pending"
273
- - cocci: apply the "cache.h" part of "the_repository.pending"
274
- - cocci: add missing "the_repository" macros to "pending"
275
- - cocci: sort "the_repository" rules by header
276
- - cocci: fix incorrect & verbose "the_repository" rules
277
- - cocci: remove dead rule from "the_repository.pending.cocci"
332
+* rs/archive-from-subdirectory-fixes (2023-03-20) 1 commit
333
+ . archive: improve support for running in a subdirectory
334
279
- Code clean-up around the use of the_repository.
335
+ "git archive" run from a subdirectory mishandled attributes and
336
+ paths outside the current directory.
337
+
338
+ Breaks CI.
339
+ cf. <xmqqlejpg17g.fsf@gitster.g>
340
+ source: <e923e844-6891-76dc-e7db-4771b2d91792@web.de>
341
+
342
+
343
+* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
344
+ (merged to 'next' on 2023-03-21 at b579e226b5)
345
+ + pack-bitmap.c: factor out `bitmap_index_seek_commit()`
346
+ + pack-bitmap.c: use `bitmap_index_seek()` where possible
347
+ + pack-bitmap.c: factor out manual `map_pos` manipulation
348
+ + pack-bitmap.c: drop unnecessary 'inline's
349
+ + pack-bitmap.c: hide bitmap internals in `read_be32()`
350
+ + pack-bitmap.c: hide bitmap internals in `read_u8()`
351
+
352
+ Clean-up the pack-bitmap codepath.
353
+
354
+ Will merge to 'master'.
355
+ source: <cover.1679342296.git.me@ttaylorr.com>
356
+
357
+
358
+* en/header-split-cleanup (2023-03-21) 16 commits
359
+ - csum-file.h: remove unnecessary inclusion of cache.h
360
+ - write-or-die.h: move declarations for write-or-die.c functions from cache.h
361
+ - treewide: remove cache.h inclusion due to setup.h changes
362
+ - setup.h: move declarations for setup.c functions from cache.h
363
+ - treewide: remove cache.h inclusion due to environment.h changes
364
+ - environment.h: move declarations for environment.c functions from cache.h
365
+ - treewide: remove unnecessary includes of cache.h
366
+ - wrapper.h: move declarations for wrapper.c functions from cache.h
367
+ - path.h: move function declarations for path.c functions from cache.h
368
+ - cache.h: remove expand_user_path()
369
+ - abspath.h: move absolute path functions from cache.h
370
+ - environment: move comment_line_char from cache.h
371
+ - treewide: remove unnecessary cache.h inclusion from several sources
372
+ - treewide: remove unnecessary inclusion of gettext.h
373
+ - treewide: be explicit about dependence on gettext.h
374
+ - treewide: remove unnecessary cache.h inclusion from a few headers
375
+
376
+ Split key function and data structure definitions out of cache.h to
377
+ new header files and adjust the users.
378
379
Needs review.
282
- source: <cover-00.17-00000000000-20230317T152724Z-avarab@gmail.com>
380
+ source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
381
382
285
-* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
286
- - completion: prompt: use generic colors
383
+* fc/docbook-remove-groff-workaround (2023-03-21) 1 commit
384
+ (merged to 'next' on 2023-03-21 at 6c59b16205)
385
+ + doc: remove GNU troff workaround
386
288
- Lift the limitation that colored prompts can only be used with
289
- PROMPT_COMMAND mode.
387
+ Remove workaround for ancient versions of DocBook to make it work
388
+ correctly with groff, which has not been necessary since docbook
389
+ 1.76 from 2010.
390
291
- Will merge to 'next'.
292
- < source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
391
+ Will merge to 'master'.
392
+ source: <20230320190047.79836-1-felipe.contreras@gmail.com>
393
394
295
-* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
296
- - object-name: fix quiet @{u} parsing
395
+* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit
396
+ - am: refer to format-patch in the documentation
397
298
- "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
299
- parsed with GET_OID_QUIETLY option, did not quietly fail, which has
300
- been corrected.
398
+ Doc update.
399
400
Will merge to 'next'.
303
- source: <20230316171514.23741-1-felipe.contreras@gmail.com>
401
+ source: <xmqq1qlij9qr.fsf@gitster.g>
402
403
306
-* jk/unused-post-2.40 (2023-03-17) 4 commits
307
- - transport: mark unused parameters in fetch_refs_from_bundle()
308
- - http: mark unused parameter in fill_active_slot() callbacks
309
- - http: drop unused parameter from start_object_request()
310
- - mailmap: drop debugging code
404
+* jk/fast-export-cleanup (2023-03-22) 6 commits
405
+ - fast-export: drop unused parameter from anonymize_commit_message()
406
+ - fast-export: drop data parameter from anonymous generators
407
+ - fast-export: de-obfuscate --anonymize-map handling
408
+ - fast-export: factor out anonymized_entry creation
409
+ - fast-export: simplify initialization of anonymized hashmaps
410
+ - fast-export: drop const when storing anonymized values
411
312
- source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
412
+ Code clean-up.
413
+
414
+ Will merge to 'next'?
415
+ source: <20230322173636.GA5643@coredump.intra.peff.net>
416
+
417
+
418
+* js/split-index-fixes (2023-03-22) 4 commits
419
+ - unpack-trees: take care to propagate the split-index flag
420
+ - fsmonitor: avoid overriding `cache_changed` bits
421
+ - split-index; stop abusing the `base_oid` to strip the "link" extension
422
+ - split-index & fsmonitor: demonstrate a bug
423
+
424
+ The index files can become corrupt under certain conditions when
425
+ the split-index feature is in use, especially together with
426
+ fsmonitor, which have been corrected.
427
+
428
+ Will merge to 'next'?
429
+ source: <pull.1497.git.1679500859.gitgitgadget@gmail.com>
430
431
--------------------------------------------------
432
[Stalled]
@@ -405,135 +522,155 @@ Release tarballs are available at:
522
--------------------------------------------------
523
[Cooking]
524
408
-* ab/fix-strategy-opts-parsing (2023-03-08) 1 commit
409
- (merged to 'next' on 2023-03-08 at bd9eff2779)
410
- + sequencer.c: fix overflow & segfault in parse_strategy_opts()
411
- (this branch is used by pw/rebase-cleanup-merge-strategy-option-handling.)
525
+* ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits
526
+ - t1507: assert output of rev-parse
527
+ - t1404: don't create unused file
528
+ - t1400: assert output of update-ref
529
+ - t1302: don't create unused file
530
+ - t1010: don't create unused files
531
+ - t1006: assert error output of cat-file
532
+ - t1005: assert output of ls-files
533
413
- The code to parse "git rebase -X<opt>" was not prepared to see an
414
- unparsable option string, which has been corrected.
534
+ Test clean-up.
535
416
- Will merge to 'master'.
417
- source: <patch-1.1-f6a06e25cf3-20230307T182039Z-avarab@gmail.com>
536
+ Needs Review.
537
+ source: <20230312201520.370234-1-rybak.a.v@gmail.com>
538
539
420
-* ew/fetch-no-write-fetch-head-fix (2023-03-09) 1 commit
421
- (merged to 'next' on 2023-03-09 at 283e2159c8)
422
- + fetch: pass --no-write-fetch-head to subprocesses
540
+* nw/for-each-ref-signature (2023-03-13) 1 commit
541
+ . ref-filter: add new "signature" atom
542
424
- Will merge to 'master'.
425
- source: <20230308222205.M679514@dcvr>
543
+ "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
544
+ placeholder and friends.
545
546
+ Breaks CI.
547
+ cf. <xmqqpm9bosjw.fsf@gitster.g>
548
+ source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
549
428
-* fc/advice-diverged-history (2023-03-08) 1 commit
429
- (merged to 'next' on 2023-03-08 at 30e7016218)
430
- + advice: add diverging advice for novices
550
432
- After "git pull" that is configured with pull.rebase=false
433
- merge.ff=only fails due to our end having our own development, give
434
- advice messages to get out of the "Not possible to fast-forward"
435
- state.
551
+* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
552
+ - credential: new attribute oauth_refresh_token
553
+
554
+ The credential subsystem learns to help OAuth framework.
555
+
556
+ Needs Review.
557
+ source: <pull.1394.git.1678776364753.gitgitgadget@gmail.com>
558
+
559
+
560
+* mh/credential-password-expiry-libsecret (2023-03-14) 1 commit
561
+ - credential/libsecret: support password_expiry_utc
562
437
- Will merge to 'master'.
438
- source: <20230308024834.1562386-2-felipe.contreras@gmail.com>
563
+ The libsecret credential helper learns to handle the password
564
+ expiry time information.
565
566
+ Needs Review.
567
+ source: <pull.1469.git.git.1678829531648.gitgitgadget@gmail.com>
568
441
-* jk/add-p-unmerged-fix (2023-03-09) 1 commit
442
- (merged to 'next' on 2023-03-09 at a46443480c)
443
- + add-patch: handle "* Unmerged path" lines
569
445
- "git add -p" while the index is unmerged sometimes failed to parse
446
- the diff output it internally produces and died, which has been
447
- corrected.
570
+* ps/fetch-ref-update-reporting (2023-03-20) 6 commits
571
+ - fetch: centralize printing of reference updates
572
+ - fetch: centralize logic to print remote URL
573
+ - fetch: centralize handling of per-reference format
574
+ - fetch: pass the full local reference name to `format_display`
575
+ - fetch: move output format into `display_state`
576
+ - fetch: move reference width calculation into `display_state`
577
449
- Will merge to 'master'.
450
- source: <ZAmfqC9WMl3XeyEr@coredump.intra.peff.net>
578
+ Clean-up of the code path that reports what "git fetch" did to each
579
+ ref.
580
581
+ Will merge to 'next'?
582
+ source: <cover.1679315383.git.ps@pks.im>
583
453
-* jk/format-patch-ignore-noprefix (2023-03-13) 6 commits
454
- (merged to 'next' on 2023-03-13 at 4b28e389f5)
455
- + rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
456
- (merged to 'next' on 2023-03-12 at 621d71c151)
457
- + format-patch: add format.noprefix option
458
- + format-patch: do not respect diff.noprefix
459
- + diff: add --default-prefix option
460
- + t4013: add tests for diff prefix options
461
- + diff: factor out src/dst prefix setup
584
463
- "git format-patch" honors the src/dst prefixes set to nonstandard
464
- values with configuration variables like "diff.noprefix", causing
465
- receiving end of the patch that expects the standard -p1 format to
466
- break. Teach "format-patch" to ignore end-user configuration and
467
- always use the standard prefixes.
585
+* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits
586
+ - rebase: remove a couple of redundant strategy tests
587
+ - rebase -m: fix serialization of strategy options
588
+ - rebase -m: cleanup --strategy-option handling
589
+ - rebase: stop reading and writing unnecessary strategy state
590
+ - Merge branch 'ab/fix-strategy-opts-parsing'
591
469
- This is a backward compatibility breaking change.
592
+ Clean-up of the code path that deals with merge strategy option
593
+ handling in "git rebase".
594
471
- Will merge to 'master'.
472
- source: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>
595
+ Needs review.
596
+ source: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
597
598
475
-* sl/diff-files-sparse (2023-03-09) 2 commits
476
- - diff-files: integrate with sparse index
477
- - t1092: add tests for `git diff-files`
599
+* ab/remove-implicit-use-of-the-repository (2023-03-17) 17 commits
600
+ - libs: use "struct repository *" argument, not "the_repository"
601
+ - post-cocci: adjust comments for recent repo_* migration
602
+ - cocci: apply the "revision.h" part of "the_repository.pending"
603
+ - cocci: apply the "rerere.h" part of "the_repository.pending"
604
+ - cocci: apply the "refs.h" part of "the_repository.pending"
605
+ - cocci: apply the "promisor-remote.h" part of "the_repository.pending"
606
+ - cocci: apply the "packfile.h" part of "the_repository.pending"
607
+ - cocci: apply the "pretty.h" part of "the_repository.pending"
608
+ - cocci: apply the "object-store.h" part of "the_repository.pending"
609
+ - cocci: apply the "diff.h" part of "the_repository.pending"
610
+ - cocci: apply the "commit.h" part of "the_repository.pending"
611
+ - cocci: apply the "commit-reach.h" part of "the_repository.pending"
612
+ - cocci: apply the "cache.h" part of "the_repository.pending"
613
+ - cocci: add missing "the_repository" macros to "pending"
614
+ - cocci: sort "the_repository" rules by header
615
+ - cocci: fix incorrect & verbose "the_repository" rules
616
+ - cocci: remove dead rule from "the_repository.pending.cocci"
617
479
- Teach "diff-files" not to expand sparse-index unless needed.
618
+ Code clean-up around the use of the_repository.
619
481
- Expecting hopefully a final and minor reroll?
482
- source: <20230309063952.42362-1-cheskaqiqi@gmail.com>
620
+ Needs review.
621
+ source: <cover-00.17-00000000000-20230317T152724Z-avarab@gmail.com>
622
623
485
-* aj/ls-files-format-fix (2023-03-10) 1 commit
486
- (merged to 'next' on 2023-03-13 at 27f876afa4)
487
- + ls-files: fix "--format" output of relative paths
624
+* fc/completion-colors-do-not-need-prompt-command (2023-03-16) 1 commit
625
+ (merged to 'next' on 2023-03-19 at 35911c8f54)
626
+ + completion: prompt: use generic colors
627
489
- Fix for a "ls-files --format="%(path)" that produced nonsense
490
- output, which was a bug in 2.38.
628
+ Lift the limitation that colored prompts can only be used with
629
+ PROMPT_COMMAND mode.
630
631
Will merge to 'master'.
493
- source: <pull.1465.git.git.1678453473484.gitgitgadget@gmail.com>
632
+ source: <20230228145934.4182166-1-felipe.contreras@gmail.com>
633
634
496
-* fc/test-aggregation-clean-up (2023-03-09) 2 commits
497
- (merged to 'next' on 2023-03-13 at f938b09366)
498
- + test: don't print aggregate-results command
499
- + test: simplify counts aggregation
635
+* fc/oid-quietly-parse-upstream (2023-03-16) 1 commit
636
+ (merged to 'next' on 2023-03-21 at 593883005f)
637
+ + object-name: fix quiet @{u} parsing
638
501
- Code clean-up for test framework.
639
+ "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
640
+ parsed with GET_OID_QUIETLY option, did not quietly fail, which has
641
+ been corrected.
642
643
Will merge to 'master'.
504
- source: <20230309173032.959968-1-felipe.contreras@gmail.com>
505
-
644
+ source: <20230316171514.23741-1-felipe.contreras@gmail.com>
645
507
-* ps/receive-pack-unlock-before-die (2023-03-10) 1 commit
508
- (merged to 'next' on 2023-03-13 at 8d099dffcc)
509
- + receive-pack: fix stale packfile locks when dying
646
511
- "git receive-pack" that responds to "git push" requests failed to
512
- clean a stale lockfile when killed in the middle, which has been
513
- corrected.
647
+* jk/unused-post-2.40 (2023-03-17) 4 commits
648
+ - transport: mark unused parameters in fetch_refs_from_bundle()
649
+ - http: mark unused parameter in fill_active_slot() callbacks
650
+ - http: drop unused parameter from start_object_request()
651
+ - mailmap: drop debugging code
652
515
- Will merge to 'master'.
516
- source: <e1ee1d8026a361bc58d16bc741e2b347ada7a53e.1678431076.git.ps@pks.im>
653
+ source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
654
655
519
-* as/doc-markup-fix (2023-03-06) 1 commit
520
- (merged to 'next' on 2023-03-07 at 8c7289659a)
521
- + git-merge-tree.txt: replace spurious HTML entity
656
+* sl/diff-files-sparse (2023-03-20) 2 commits
657
+ - diff-files: integrate with sparse index
658
+ - t1092: add tests for `git diff-files`
659
523
- Fix for a mis-mark-up in doc made in Git 2.39 days.
660
+ Teach "diff-files" not to expand sparse-index unless needed.
661
525
- Will merge to 'master'.
526
- source: <87y1oco3i9.fsf@igel.home>
662
+ Comments?
663
+ source: <20230320205241.105476-1-cheskaqiqi@gmail.com>
664
665
529
-* ds/ahead-behind (2023-03-15) 9 commits
530
- - SQUASH??? leak fix (spotted by Peff)
666
+* ds/ahead-behind (2023-03-20) 9 commits
667
- commit-reach: add tips_reachable_from_bases()
668
- for-each-ref: add ahead-behind format atom
669
- commit-reach: implement ahead_behind() logic
670
- commit-graph: introduce `ensure_generations_valid()`
671
- commit-graph: return generation from memory
536
- - commit-graph: combine generation computations
672
+ - commit-graph: simplify compute_generation_numbers()
673
+ - commit-graph: refactor compute_topological_levels()
674
- for-each-ref: explicitly test no matches
675
- for-each-ref: add --stdin option
676
@@ -541,8 +678,8 @@ Release tarballs are available at:
678
distances from a single reference point in the history with bunch
679
of commits in bulk.
680
544
- Will merge to 'next'?
545
- source: <pull.1489.v3.git.1678902343.gitgitgadget@gmail.com>
681
+ Will merge to 'next'.
682
+ source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
683
684
685
* gc/config-parsing-cleanup (2023-03-15) 8 commits
@@ -561,95 +698,16 @@ Release tarballs are available at:
698
source: <pull.1463.v2.git.git.1678925506.gitgitgadget@gmail.com>
699
700
564
-* jk/bundle-progress (2023-03-06) 1 commit
565
- (merged to 'next' on 2023-03-07 at 0df2b09e1b)
566
- + bundle: turn on --all-progress-implied by default
567
-
568
- Simplify UI to control progress meter given by "git bundle" command.
569
-
570
- Will merge to 'master'.
571
- source: <ZAMjkffYmp+DNmr+@coredump.intra.peff.net>
572
-
573
-
574
-* jk/bundle-use-dash-for-stdfiles (2023-03-06) 5 commits
575
- (merged to 'next' on 2023-03-07 at 8ceb58f725)
576
- + parse-options: use prefix_filename_except_for_dash() helper
577
- + parse-options: consistently allocate memory in fix_filename()
578
- + bundle: don't blindly apply prefix_filename() to "-"
579
- + bundle: document handling of "-" as stdin
580
- + bundle: let "-" mean stdin for reading operations
581
-
582
- "git bundle" learned that "-" is a common way to say that the input
583
- comes from the standard input and/or the output goes to the
584
- standard output. It used to work only for output and only from the
585
- root level of the working tree.
586
-
587
- Will merge to 'master'.
588
- source: <ZAMb8LSpm2gOrpeY@coredump.intra.peff.net>
589
-
590
-
591
-* jk/format-patch-change-format-for-empty-commits (2023-03-03) 1 commit
592
- (merged to 'next' on 2023-03-07 at 1c421f4a9f)
593
- + format-patch: output header for empty commits
594
-
595
- "git format-patch" learned to write a log-message only output file
596
- for empty commits.
597
-
598
- Will merge to 'master'.
599
- source: <20230303160301.3659328-1-john@keeping.me.uk>
600
-
601
-
602
-* ds/reprepare-alternates-when-repreparing-packfiles (2023-03-09) 1 commit
603
- (merged to 'next' on 2023-03-09 at 851bceed17)
604
- + object-file: reprepare alternates when necessary
605
-
606
- Once we start running, we assumed that the list of alternate object
607
- databases would never change. Hook into the machinery used to
608
- update the list of packfiles during runtime to update this list as
609
- well.
610
-
611
- Will merge to 'master'.
612
- source: <pull.1490.v2.git.1678301252360.gitgitgadget@gmail.com>
613
-
614
-
615
-* ak/restore-both-incompatible-with-conflicts (2023-02-27) 1 commit
616
- (merged to 'next' on 2023-03-06 at 4ee341853c)
617
- + restore: fault --staged --worktree with merge opts
618
-
619
- "git restore" supports options like "--ours" that are only
620
- meaningful during a conflicted merge, but these options are only
621
- meaningful when updating the working tree files. These options are
622
- marked to be incompatible when both "--staged" and "--worktree" are
623
- in effect.
624
-
625
- Will merge to 'master'.
626
- source: <20230226184354.221-1-andy.koppe@gmail.com>
627
-
628
-
629
-* zh/push-to-delete-onelevel-ref (2023-03-01) 2 commits
630
- (merged to 'next' on 2023-03-06 at f08def5949)
631
- + push: allow delete single-level ref
632
- + receive-pack: fix funny ref error messsage
633
-
634
- "git push" has been taught to allow deletion of refs with one-level
635
- names to help repairing a repository who acquired such a ref by
636
- mistake. In general, we don't encourage use of such a ref, and
637
- creation or update to such a ref is rejected as before.
638
-
639
- Will merge to 'master'.
640
- source: <pull.1465.v4.git.1677666029.gitgitgadget@gmail.com>
641
-
642
-
701
* my/wildmatch-cleanups (2023-02-27) 5 commits
644
- - wildmatch: more cleanups after killing uchar
645
- - wildmatch: use char instead of uchar
646
- - wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
647
- - wildmatch: remove IS*() macros
648
- - git-compat-util: add isblank() and isgraph()
702
+ . wildmatch: more cleanups after killing uchar
703
+ . wildmatch: use char instead of uchar
704
+ . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
705
+ . wildmatch: remove IS*() macros
706
+ . git-compat-util: add isblank() and isgraph()
707
708
Code clean-up.
709
652
- Comments?
710
+ Ejected as it conflicts with pw/wildmatch-fixes topic.
711
source: <20230226115021.1681834-1-masahiroy@kernel.org>
712
713
@@ -668,7 +726,7 @@ Release tarballs are available at:
726
source: <20230228185253.2356546-1-calvinwan@google.com>
727
728
671
-* ah/rebase-merges-config (2023-03-13) 3 commits
729
+* ah/rebase-merges-config (2023-03-20) 3 commits
730
- rebase: add a config option for --rebase-merges
731
- rebase: deprecate --rebase-merges=""
732
- rebase: add documentation and test for --no-rebase-merges
@@ -676,20 +734,8 @@ Release tarballs are available at:
734
Streamline --rebase-merges command line option handling and
735
introduce rebase.merges configuration variable.
736
679
- On hold.
680
- source: <20230312210456.92364-1-alexhenrie24@gmail.com>
681
-
682
-
683
-* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
684
- (merged to 'next' on 2023-03-06 at 5dc1c4c0b7)
685
- + commit-reach: avoid NULL dereference
686
-
687
- Fix a segfaulting loop. The function and its caller may need
688
- further clean-up.
689
-
690
- Will merge to 'master'.
691
- cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
692
- source: <20230211111526.2028178-1-e@80x24.org>
737
+ Comments?
738
+ source: <20230320055955.461138-1-alexhenrie24@gmail.com>
739
740
741
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
@@ -706,21 +752,6 @@ Release tarballs are available at:
752
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
753
754
709
-* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
710
- (merged to 'next' on 2023-03-06 at 60d7d0d493)
711
- + tests: don't lose misc "git" exit codes
712
- + tests: don't lose exit status with "test <op> $(git ...)"
713
- + tests: don't lose "git" exit codes in "! ( git ... | grep )"
714
- + tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
715
- + t/lib-patch-mode.sh: fix ignored exit codes
716
- + auto-crlf tests: don't lose exit code in loops and outside tests
717
-
718
- Test clean-up.
719
-
720
- Will merge to 'master'.
721
- source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
722
-
723
-
755
* rj/branch-unborn-in-other-worktrees (2023-02-22) 3 commits
756
(merged to 'next' on 2023-03-06 at 6ee0ec72ae)
757
+ branch: rename orphan branches in any worktree
@@ -781,33 +812,6 @@ Release tarballs are available at:
812
source: <20230120113553.24655-1-carenas@gmail.com>
813
814
784
-* rj/avoid-switching-to-already-used-branch (2023-02-25) 4 commits
785
- (merged to 'next' on 2023-03-06 at 7546231ddf)
786
- + switch: reject if the branch is already checked out elsewhere (test)
787
- + rebase: refuse to switch to a branch already checked out elsewhere (test)
788
- + branch: fix die_if_checked_out() when ignore_current_worktree
789
- + worktree: introduce is_shared_symref()
790
-
791
- A few subcommands have been taught to stop users from working on a
792
- branch that is being used in another worktree linked to the same
793
- repository.
794
-
795
- Will merge to 'master'.
796
- source: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
797
-
798
-
799
-* rj/bisect-already-used-branch (2023-01-22) 1 commit
800
- (merged to 'next' on 2023-03-06 at 3508814a41)
801
- + bisect: fix "reset" when branch is checked out elsewhere
802
-
803
- Allow "git bisect reset" to check out the original branch when the
804
- branch is already checked out in a different worktree linked to the
805
- same repository.
806
-
807
- Will merge to 'master'.
808
- source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
809
-
810
-
815
* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
816
- send-email: expose header information to git-send-email's sendemail-validate hook
817
- send-email: refactor header generation functions