What's cooking (2022/02 #06)
Junio C Hamano committed
Feb 23, 2022 at 17:22 UTC
8d482462f2a28a4b7132bb917cb89939971d8f9a
1 file changed
+357
-484
whats-cooking.txt
+357
-484
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2022, #05; Thu, 17)
4
-X-master-at: e2ac9141e64e2cd3e690d1b5fc848949827c09b4
5
-X-next-at: 5d30c73bfbb79b338e9ebbb6ed42713ff8f22e23
3
+Subject: What's cooking in git.git (Feb 2022, #06; Wed, 23)
4
+X-master-at: dab1b7905d0b295f1acef9785bb2b9cbb0fdec84
5
+X-next-at: 0bdcbb44647328cb1bdb23be648ecb677189c7b4
6
7
-What's cooking in git.git (Feb 2022, #05; Thu, 17)
7
+What's cooking in git.git (Feb 2022, #06; Wed, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,8 +18,7 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
21
-We are near the end of 4th week of a 12-week cycle, and the fourth
22
-and the fifth batches of topics are in the 'master' ('main') branch.
21
+Many topics have no summary written yet for them in this issue.
22
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
@@ -52,236 +51,347 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
55
-* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
56
- (merged to 'next' on 2022-02-08 at 9922938a6a)
57
- + compat: auto-detect if zlib has uncompress2()
58
-
59
- The build procedure has been taught to notice older version of zlib
60
- and enable our replacement uncompress2() automatically.
61
- source: <xmqqr18x3s5s.fsf@gitster.g>
62
-
63
-
64
-* ab/complete-show-all-commands (2022-02-02) 2 commits
65
- (merged to 'next' on 2022-02-09 at be3b7cf4e4)
66
- + completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
67
- + completion tests: re-source git-completion.bash in a subshell
68
-
69
- The command line completion script (in contrib/) learned to
70
- complete all Git subcommands, including the ones that are normally
71
- hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
72
- source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
73
-
74
-
75
-* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
76
- (merged to 'next' on 2022-02-08 at 1a8001f83e)
77
- + perl Git.pm: don't ignore signalled failure in _cmd_close()
78
-
79
- Git.pm update.
80
- source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
54
+* ab/hash-object-leakfix (2022-02-06) 1 commit
55
+ (merged to 'next' on 2022-02-10 at 14956d3087)
56
+ + hash-object: fix a trivial leak in --path
57
58
+ Trivial leakfix.
59
+ source: <patch-1.1-53863df1455-20220205T000422Z-avarab@gmail.com>
60
83
-* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
84
- (merged to 'next' on 2022-02-08 at 95a8a91e97)
85
- + repo-settings: rename the traditional default fetch.negotiationAlgorithm
86
- + repo-settings: fix error handling for unknown values
87
- + repo-settings: fix checking for fetch.negotiationAlgorithm=default
61
89
- Interaction between fetch.negotiationAlgorithm and
90
- feature.experimental configuration variables has been corrected.
91
- source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
62
+* ab/release-transport-ls-refs-options (2022-02-06) 1 commit
63
+ (merged to 'next' on 2022-02-10 at c4e57c2b29)
64
+ + ls-remote & transport API: release "struct transport_ls_refs_options"
65
66
+ source: <patch-1.1-e80e8f64eae-20220205T000809Z-avarab@gmail.com>
67
94
-* en/remerge-diff (2022-02-02) 11 commits
95
- (merged to 'next' on 2022-02-08 at 68b9a8a38b)
96
- + diff-merges: avoid history simplifications when diffing merges
97
- + merge-ort: mark conflict/warning messages from inner merges as omittable
98
- + show, log: include conflict/warning messages in --remerge-diff headers
99
- + diff: add ability to insert additional headers for paths
100
- + merge-ort: format messages slightly different for use in headers
101
- + merge-ort: mark a few more conflict messages as omittable
102
- + merge-ort: capture and print ll-merge warnings in our preferred fashion
103
- + ll-merge: make callers responsible for showing warnings
104
- + log: clean unneeded objects during `log --remerge-diff`
105
- + show, log: provide a --remerge-diff capability
106
- + Merge branch 'ns/tmp-objdir' into en/remerge-diff
107
- (this branch is used by en/merge-tree.)
68
109
- "git log --remerge-diff" shows the difference from mechanical merge
110
- result and the result that is actually recorded in a merge commit.
111
- source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>
69
+* ab/t0051-skip-on-non-windows (2022-02-04) 1 commit
70
+ (merged to 'next' on 2022-02-10 at 3e587df1d6)
71
+ + t0051: use "skip_all" under !MINGW in single-test file
72
73
+ Conditional test update.
74
+ source: <patch-v2-1.1-1bc93bcba4b-20220204T134208Z-avarab@gmail.com>
75
114
-* hn/reftable-coverity-fixes (2022-01-20) 17 commits
115
- (merged to 'next' on 2022-02-08 at 1baf327a66)
116
- + reftable: add print functions to the record types
117
- + reftable: make reftable_record a tagged union
118
- + reftable: remove outdated file reftable.c
119
- + reftable: implement record equality generically
120
- + reftable: make reftable-record.h function signatures const correct
121
- + reftable: handle null refnames in reftable_ref_record_equal
122
- + reftable: drop stray printf in readwrite_test
123
- + reftable: order unittests by complexity
124
- + reftable: all xxx_free() functions accept NULL arguments
125
- + reftable: fix resource warning
126
- + reftable: ignore remove() return value in stack_test.c
127
- + reftable: check reftable_stack_auto_compact() return value
128
- + reftable: fix resource leak blocksource.c
129
- + reftable: fix resource leak in block.c error path
130
- + reftable: fix OOB stack write in print functions
131
- + Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
132
- + Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
76
134
- Problems identified by Coverity in the reftable code have been
135
- corrected.
136
- source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
77
+* ah/log-no-graph (2022-02-11) 2 commits
78
+ (merged to 'next' on 2022-02-14 at 6c8fd1f37f)
79
+ + log: add a --no-graph option
80
+ + log: fix memory leak if --graph is passed multiple times
81
+
82
+ "git log --graph --graph" used to leak a graph structure, and there
83
+ was no way to countermand "--graph" that appear earlier on the
84
+ command line. A "--no-graph" option has been added and resource
85
+ leakage has been plugged.
86
+ source: <20220211163627.598166-2-alexhenrie24@gmail.com>
87
88
139
-* hn/reftable-tests (2022-01-31) 3 commits
140
- (merged to 'next' on 2022-02-09 at 5e22946a1f)
141
- + t5312: prepare for reftable
142
- + t1405: mark test that checks existence as REFFILES
143
- + t1405: explictly delete reflogs for reftable
89
+* bc/clarify-eol-attr (2022-02-14) 1 commit
90
+ (merged to 'next' on 2022-02-14 at 7e23e61f3f)
91
+ + doc: clarify interaction between 'eol' and text=auto
92
+
93
+ Documentation update
94
+ source: <xmqqilth2u28.fsf@gitster.g>
95
+
96
145
- Prepare more test scripts for the introduction of reftable.
146
- source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
97
+* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2022-02-11) 1 commit
98
+ (merged to 'next' on 2022-02-14 at 9abd0dce80)
99
+ + fetch-pack: parameterize message containing 'ready' keyword
100
+
101
+ L10n support for a few error messages.
102
+ source: <20211222075805.19027-1-bagasdotme@gmail.com>
103
+
104
+
105
+* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit
106
+ (merged to 'next' on 2022-02-10 at 213f44aec8)
107
+ + receive-pack: purge temporary data if no command is ready to run
108
+
109
+ "receive-pack" checks if it will do any ref updates (various
110
+ conditions could reject a push) before received objects are taken
111
+ out of the temporary directory used for quarantine purposes, so
112
+ that a push that is known-to-fail will not leave crufts that a
113
+ future "gc" needs to clean up.
114
+ source: <20220129063538.24038-1-bojun.cbj@gmail.com>
115
+
116
+
117
+* ds/mailmap (2022-02-14) 1 commit
118
+ (merged to 'next' on 2022-02-14 at 1e50634951)
119
+ + mailmap: change primary address for Derrick Stolee
120
+
121
+ Update mailmap entries.
122
+ source: <pull.1142.git.1644857153590.gitgitgadget@gmail.com>
123
+
124
+
125
+* gc/branch-recurse-submodules (2022-02-04) 7 commits
126
+ (merged to 'next' on 2022-02-10 at b54367ff92)
127
+ + branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks
128
+ + branch: add --recurse-submodules option for branch creation
129
+ + builtin/branch: consolidate action-picking logic in cmd_branch()
130
+ + branch: add a dry_run parameter to create_branch()
131
+ + branch: make create_branch() always create a branch
132
+ + branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
133
+ + Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
134
135
+ "git branch" learned the "--recurse-submodules" option.
136
+ source: <20220129000446.99261-1-chooglen@google.com>
137
149
-* js/diff-filter-negation-fix (2022-01-28) 3 commits
150
- (merged to 'next' on 2022-02-08 at fe004a4c2c)
151
- + diff-filter: be more careful when looking for negative bits
152
- + diff.c: move the diff filter bits definitions up a bit
153
- + docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
138
155
- "git diff --diff-filter=aR" is now parsed correctly.
156
- source: <f1f027ad61beb1bd0dee73acbffdee5c0f967e9a.1643371370.git.gitgitgadget@gmail.com>
139
+* hw/t1410-adjust-test-for-reftable (2022-02-09) 2 commits
140
+ (merged to 'next' on 2022-02-14 at 6b96b4faa4)
141
+ + t1410: mark bufsize boundary test as REFFILES
142
+ + t1410: use test-tool ref-store to inspect reflogs
143
144
+ Fix tests that are unnecessarily specific to ref-files backend.
145
+ source: <pull.1213.git.git.1644406180.gitgitgadget@gmail.com>
146
159
-* js/no-more-legacy-stash (2022-01-27) 4 commits
160
- (merged to 'next' on 2022-02-08 at 5cecfdbd58)
161
- + stash: stop warning about the obsolete `stash.useBuiltin` config setting
162
- + stash: remove documentation for `stash.useBuiltin`
163
- + add: remove support for `git-legacy-stash`
164
- + git-sh-setup: remove remnant bits referring to `git-legacy-stash`
147
166
- Removal of unused code and doc.
167
- source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
148
+* jc/glossary-worktree (2022-02-09) 1 commit
149
+ (merged to 'next' on 2022-02-10 at d05e2b6ea3)
150
+ + glossary: describe "worktree"
151
152
+ "working tree" and "per-worktree ref" were in glossary, but
153
+ "worktree" itself wasn't, which has been corrected.
154
+ source: <xmqqczjvxy3o.fsf@gitster.g>
155
170
-* js/scalar-global-options (2022-01-28) 1 commit
171
- (merged to 'next' on 2022-02-09 at 8af744524c)
172
- + scalar: accept -C and -c options before the subcommand
156
174
- Scalar update.
175
- source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
176
-
177
-
178
-* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
179
- (merged to 'next' on 2022-02-09 at 8665cb204a)
180
- + patch-id: fix scan_hunk_header on diffs with 1 line of before/after
181
- + patch-id: fix antipatterns in tests
182
-
183
- Unlike "git apply", "git patch-id" did not handle patches with
184
- hunks that has only 1 line in either preimage or postimage, which
185
- has been corrected.
186
- source: <20220202041945.10077-1-jerry@skydio.com>
187
- source: <20220202042015.10115-1-jerry@skydio.com>
188
-
189
-
190
-* jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit
191
- (merged to 'next' on 2022-02-09 at f26a82c66a)
192
- + git-rev-list: add --exclude-first-parent-only flag
193
-
194
- "git log" and friends learned an option --exclude-first-parent-only
195
- to propagate UNINTERESTING bit down only along the first-parent
196
- chain, just like --first-parent option shows commits that lack the
197
- UNINTERESTING bit only along the first-parent chain.
198
- source: <20220111213941.30129-1-jerry@skydio.com>
199
-
200
-
201
-* ld/sparse-index-bash-completion (2022-02-08) 3 commits
202
- (merged to 'next' on 2022-02-08 at ac1e968ab8)
203
- + completion: handle unusual characters for sparse-checkout
204
- + completion: improve sparse-checkout cone mode directory completion
205
- + completion: address sparse-checkout issues
157
+* jd/t0015-modernize (2022-02-09) 1 commit
158
+ (merged to 'next' on 2022-02-10 at a3733234c0)
159
+ + t/t0015-hash.sh: remove unnecessary '\' at line end
160
207
- The command line completion (in contrib/) learns to complete
208
- arguments to give to "git sparse-checkout" command.
209
- source: <pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>
161
+ Test modernization.
162
+ source: <20220208092339.651761-2-jaydeepjd.8914@gmail.com>
163
164
212
-* ll/doc-mktree-typofix (2022-02-02) 1 commit
213
- (merged to 'next' on 2022-02-08 at fe98063f1a)
214
- + fix typo in git-mktree.txt
165
+* js/short-help-outside-repo-fix (2022-02-08) 2 commits
166
+ (merged to 'next' on 2022-02-10 at a86376de89)
167
+ + t0012: verify that built-ins handle `-h` even without gitdir
168
+ + checkout/fetch/pull/pack-objects: allow `-h` outside a repository
169
216
- Typofix.
217
- source: <pull.1207.git.git.1643792450866.gitgitgadget@gmail.com>
170
+ "git cmd -h" outside a repository should error out cleanly for many
171
+ commands, but instead it hit a BUG(), which has been corrected.
172
+ source: <pull.1139.v2.git.1644319314.gitgitgadget@gmail.com>
173
174
220
-* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
221
- (merged to 'next' on 2022-02-09 at 47631df376)
222
- + doc: check-ignore: code-quote an exclamation mark
175
+* ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits
176
+ (merged to 'next' on 2022-02-10 at 4866a64508)
177
+ + refs: skip hooks when deleting uncovered packed refs
178
+ + refs: do not execute reference-transaction hook on packing refs
179
+ + refs: demonstrate excessive execution of the reference-transaction hook
180
+ + refs: allow skipping the reference-transaction hook
181
+ + refs: allow passing flags when beginning transactions
182
+ + refs: extract packed_refs_delete_refs() to allow control of transaction
183
224
- Typofix.
225
- source: <20220203101643.1987-1-philipoakley@iee.email>
184
+ Because a deletion of ref would need to remove it from both the
185
+ loose ref store and the packed ref store, a delete-ref operation
186
+ that logically removes one ref may end up invoking ref-transaction
187
+ hook twice, which has been corrected.
188
+ source: <cover.1642406989.git.ps@pks.im>
189
190
228
-* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
229
- (merged to 'next' on 2022-02-09 at 8b7ecb4e99)
230
- + t/lib-read-tree-m-3way: indent with tabs
231
- + t/lib-read-tree-m-3way: modernize style
191
+* ps/fetch-optim-with-commit-graph (2022-02-10) 2 commits
192
+ (merged to 'next' on 2022-02-14 at 2b331293fb)
193
+ + fetch: skip computing output width when not printing anything
194
+ + fetch-pack: use commit-graph when computing cutoff
195
233
- Style updates on a test script helper.
234
- source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
196
+ A couple of optimization to "git fetch".
197
+ source: <cover.1644495978.git.ps@pks.im>
198
199
237
-* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits
238
- (merged to 'next' on 2022-02-08 at a8cc333d78)
239
- + pack-bitmap.c: gracefully fallback after opening pack/MIDX
240
- + midx: read `RIDX` chunk when present
241
- + t/lib-bitmap.sh: parameterize tests over reverse index source
242
- + t5326: move tests to t/lib-bitmap.sh
243
- + t5326: extract `test_rev_exists`
244
- + t5326: drop unnecessary setup
245
- + pack-revindex.c: instrument loading on-disk reverse index
246
- + midx.c: make changing the preferred pack safe
247
- + t5326: demonstrate bitmap corruption after permutation
200
+* pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits
201
+ (merged to 'next' on 2022-02-10 at bd7c3615fe)
202
+ + rebase -m: don't fork git checkout
203
+ + rebase --apply: set ORIG_HEAD correctly
204
+ + rebase --apply: fix reflog
205
+ + reset_head(): take struct rebase_head_opts
206
+ + rebase: cleanup reset_head() calls
207
+ + create_autostash(): remove unneeded parameter
208
+ + reset_head(): make default_reflog_action optional
209
+ + reset_head(): factor out ref updates
210
+ + reset_head(): remove action parameter
211
+ + rebase --apply: don't run post-checkout hook if there is an error
212
+ + rebase: do not remove untracked files on checkout
213
+ + rebase: pass correct arguments to post-checkout hook
214
+ + t5403: refactor rebase post-checkout hook tests
215
+ + rebase: factor out checkout for up to date branch
216
249
- A bug that made multi-pack bitmap and the object order out-of-sync,
250
- making the .midx data corrupt, has been fixed.
251
- source: <cover.1643150456.git.me@ttaylorr.com>
217
+ Use an internal call to reset_head() helper function instead of
218
+ spawning "git checkout" in "rebase", and update code paths that are
219
+ involved in the change.
220
+ source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
221
222
254
-* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
255
- (merged to 'next' on 2022-02-09 at 849450010e)
256
- + subtree: force merge commit
223
+* sy/t0001-use-path-is-helper (2022-02-11) 1 commit
224
+ (merged to 'next' on 2022-02-14 at 2f1bdb0803)
225
+ + t0001: replace "test [-d|-f]" with test_path_is_* functions
226
258
- When "git subtree" wants to create a merge, it used "git merge" and
259
- let it be affected by end-user's "merge.ff" configuration, which
260
- has been corrected.
261
- source: <20220201172601.262718-1-aclopte@gmail.com>
227
+ Test modernization.
228
+ source: <20220121102109.433457-2-shaoxuan.yuan02@gmail.com>
229
230
264
-* vd/sparse-clean-etc (2022-01-13) 9 commits
265
- (merged to 'next' on 2022-02-09 at 5928dbd25e)
266
- + update-index: reduce scope of index expansion in do_reupdate
267
- + update-index: integrate with sparse index
268
- + update-index: add tests for sparse-checkout compatibility
269
- + checkout-index: integrate with sparse index
270
- + checkout-index: add --ignore-skip-worktree-bits option
271
- + checkout-index: expand sparse checkout compatibility tests
272
- + clean: integrate with sparse index
273
- + reset: reorder wildcard pathspec conditions
274
- + reset: fix validation in sparse index test
275
- (this branch is used by en/present-despite-skipped.)
231
+* tb/midx-no-bitmap-for-no-objects (2022-02-09) 1 commit
232
+ (merged to 'next' on 2022-02-10 at 5c501a3f80)
233
+ + midx: prevent writing a .bitmap without any objects
234
277
- "git update-index", "git checkout-index", and "git clean" are
278
- taught to work better with the sparse checkout feature.
279
- source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
235
+ When there is no object to write .bitmap file for, "git
236
+ multi-pack-index" triggered an error, instead of just skipping,
237
+ which has been corrected.
238
+ source: <abc67d757cb6b244cf54b7b030985180ce134724.1644434802.git.me@ttaylorr.com>
239
240
--------------------------------------------------
241
[New Topics]
242
284
-* en/sparse-checkout-fixes (2022-02-17) 5 commits
243
+* et/xdiff-indirection (2022-02-17) 1 commit
244
+ - xdiff: provide indirection to git functions
245
+
246
+ Insert a layer of preprocessor macros for common functions in xdiff
247
+ codebase.
248
+
249
+ Sort of Meh, other than the fact that it documents what can
250
+ plausibly be renamed.
251
+ source: <20220217225408.GB7@edef91d97c94>
252
+
253
+
254
+* tb/coc-plc-update (2022-02-18) 1 commit
255
+ (merged to 'next' on 2022-02-23 at 9d45e42c9a)
256
+ + CODE_OF_CONDUCT.md: update PLC members list
257
+
258
+ Document Taylor as a new member of Git PLC at SFC. Welcome.
259
+
260
+ Will merge to 'master'.
261
+ source: <f5daef58bc0bededd46bc9686c586ba5ae9a453c.1645211253.git.me@ttaylorr.com>
262
+
263
+
264
+* jt/ls-files-stage-recurse (2022-02-23) 1 commit
265
+ - ls-files: support --recurse-submodules --stage
266
+
267
+ Many output modes of "ls-files" does not work with its
268
+ "--recurse-submodules" option, but the "-s" mode has taught to work
269
+ with it.
270
+ source: <20220224002303.2363189-1-jonathantanmy@google.com>
271
+
272
+
273
+* ab/c99 (2022-02-21) 2 commits
274
+ - C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code
275
+ - git-compat-util.h: clarify GCC v.s. C99-specific in comment
276
+
277
+ source: <cover-v4-0.2-00000000000-20220221T160440Z-avarab@gmail.com>
278
+
279
+
280
+* ab/hook-tests (2022-02-19) 2 commits
281
+ - hook tests: use a modern style for "pre-push" tests
282
+ - hook tests: test for exact "pre-push" hook input
283
+
284
+ source: <cover-0.2-00000000000-20220218T204719Z-avarab@gmail.com>
285
+
286
+
287
+* ab/test-lib-tweaks (2022-02-21) 4 commits
288
+ - test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS
289
+ - test-lib: make $GIT_BUILD_DIR an absolute path
290
+ - test-lib: correct commentary on TEST_DIRECTORY overriding
291
+ - test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS
292
+
293
+ source: <cover-v3-0.4-00000000000-20220221T155656Z-avarab@gmail.com>
294
+
295
+
296
+* ds/worktree-docs (2022-02-23) 11 commits
297
+ - worktree: use 'worktree' over 'working tree'
298
+ - worktree: use 'worktree' over 'working tree'
299
+ - worktree: use 'worktree' over 'working tree'
300
+ - worktree: use 'worktree' over 'working tree'
301
+ - worktree: use 'worktree' over 'working tree'
302
+ - worktree: use 'worktree' over 'working tree'
303
+ - worktree: use 'worktree' over 'working tree'
304
+ - worktree: extract checkout_worktree()
305
+ - worktree: extract copy_sparse_checkout()
306
+ - worktree: extract copy_filtered_worktree_config()
307
+ - worktree: combine two translatable messages
308
+ (this branch uses ds/sparse-checkout-requires-per-worktree-config.)
309
+
310
+ source: <pull.1154.v3.git.1645626559.gitgitgadget@gmail.com>
311
+
312
+
313
+* en/merge-ort-plug-leaks (2022-02-20) 2 commits
314
+ - merge-ort: fix small memory leak in unique_path()
315
+ - merge-ort: fix small memory leak in detect_and_process_renames()
316
+
317
+ source: <pull.1152.v2.git.1645320591.gitgitgadget@gmail.com>
318
+
319
+
320
+* jc/rerere-train-modernise (2022-02-20) 1 commit
321
+ - rerere-train: modernise a bit
322
+
323
+ source: <xmqqsfsjuw8m.fsf@gitster.g>
324
+
325
+
326
+* ab/help-fixes (2022-02-23) 9 commits
327
+ - help: don't print "\n" before single-section output
328
+ - help: add --no-[external-commands|aliases] for use with --all
329
+ - help: error if [-a|-g|-c] and [-i|-m|-w] are combined
330
+ - help: correct usage & behavior of "git help --all"
331
+ - help: note the option name on option incompatibility
332
+ - help.c: split up list_all_cmds_help() function
333
+ - help tests: test "git" and "git help [-a|-g] spacing
334
+ - help.c: use puts() instead of printf{,_ln}() for consistency
335
+ - help doc: add missing "]" to "[-a|--all]"
336
+
337
+ source: <cover-v2-0.9-00000000000-20220221T193708Z-avarab@gmail.com>
338
+
339
+
340
+* ac/usage-string-fixups (2022-02-23) 2 commits
341
+ - parse-options.c: add style checks for usage-strings
342
+ - amend remaining usage strings according to style guide
343
+
344
+ source: <pull.1147.v3.git.1645626455.gitgitgadget@gmail.com>
345
+
346
+
347
+* mc/index-pack-report-max-size (2022-02-23) 2 commits
348
+ - t5302: confirm that large packs mention limit
349
+ - index-pack: clarify the breached limit
350
+
351
+ source: <pull.1158.git.1645632193.gitgitgadget@gmail.com>
352
+
353
+
354
+* sm/no-git-in-upstream-of-pipe-in-tests (2022-02-23) 1 commit
355
+ - t0003: avoid pipes with Git on LHS
356
+
357
+ source: <20220223115347.3083-3-shivam828787@gmail.com>
358
+
359
+--------------------------------------------------
360
+[Stalled]
361
+
362
+* je/http-better-error-output (2021-12-03) 1 commit
363
+ . http-backend: give a hint that web browser access is not supported
364
+
365
+ When the http-backend program, which is the server-side component
366
+ for the smart HTTP transport, sends a "404 Not found" error, we
367
+ deliberately did not say anything to the requesting client. We now
368
+ send a message back to the browser to tell the user that they do
369
+ not want to visit the URL via their browser, instead of a totally
370
+ blank page.
371
+
372
+ Expecting a reroll.
373
+ Breaks its self tests.
374
+ cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
375
+ source: <20211202102855.23907-1-jengelh@inai.de>
376
+
377
+
378
+* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
379
+ - fixup! editor: allow for saving/restoring terminal state
380
+ - editor: allow for saving/restoring terminal state
381
+ - terminal: teach save_term to fail when not foreground
382
+
383
+ Some editors are reported to leave the terminal in funny state
384
+ after they exit on Windows. Work it around by saving and restoring
385
+ the terminal state when needed.
386
+
387
+ Expecting a reroll.
388
+ cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
389
+ source: <20211202035446.1154-1-carenas@gmail.com>
390
+
391
+--------------------------------------------------
392
+[Cooking]
393
+
394
+* en/sparse-checkout-fixes (2022-02-20) 5 commits
395
- sparse-checkout: reject arguments in cone-mode that look like patterns
396
- sparse-checkout: error or warn when given individual files
397
- sparse-checkout: pay attention to prefix for {set, add}
@@ -290,8 +400,8 @@ Release tarballs are available at:
400
401
Further polishing of "git sparse-checkout".
402
293
- Will merge to 'next'?
294
- source: <pull.1118.v4.git.1645080889.gitgitgadget@gmail.com>
403
+ Will merge to 'next'.
404
+ source: <pull.1118.v5.git.1645289086.gitgitgadget@gmail.com>
405
406
407
* jc/name-rev-stdin (2022-02-15) 1 commit
@@ -326,16 +436,17 @@ Release tarballs are available at:
436
source: <cover-0.2-00000000000-20220216T105250Z-avarab@gmail.com>
437
438
329
-* pw/single-key-interactive (2022-02-16) 3 commits
439
+* pw/single-key-interactive (2022-02-23) 4 commits
440
- add -p: disable stdin buffering when interactive.singlekey is set
441
- terminal: set VMIN and VTIME in non-canonical mode
442
- terminal: pop signal handler when terminal is restored
443
+ - terminal: always reset terminal when reading without echo
444
445
The single-key interactive operation used by "git add -p" has been
446
made more robust.
447
448
Will merge to 'next'?
338
- source: <pull.1146.git.1645008873.gitgitgadget@gmail.com>
449
+ source: <pull.1146.v2.git.1645556015.gitgitgadget@gmail.com>
450
451
452
* jh/builtin-fsmonitor-part3 (2022-02-16) 25 commits
@@ -370,28 +481,30 @@ Release tarballs are available at:
481
source: <pull.1143.git.1644940773.gitgitgadget@gmail.com>
482
483
373
-* ds/core-untraced-cache-config (2022-02-17) 1 commit
374
- - dir: force untracked cache with core.untrackedCache
484
+* ds/core-untracked-cache-config (2022-02-17) 1 commit
485
+ (merged to 'next' on 2022-02-18 at 0c426fdec1)
486
+ + dir: force untracked cache with core.untrackedCache
487
488
Setting core.untrackedCache to true failed to add the untracked
489
cache extension to the index.
490
379
- Will merge to 'next'.
491
+ Will merge to 'master'.
492
source: <pull.1058.v2.git.1645131630140.gitgitgadget@gmail.com>
493
494
495
* en/ort-inner-merge-conflict-report (2022-02-17) 1 commit
384
- - merge-ort: make informational messages from recursive merges clearer
496
+ (merged to 'next' on 2022-02-18 at 367dd32e74)
497
+ + merge-ort: make informational messages from recursive merges clearer
498
499
Messages "ort" merge backend prepares while dealing with conflicted
500
paths were unnecessarily confusing since it did not differentiate
501
inner merges and outer merges.
502
390
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <pull.1121.git.1645079923090.gitgitgadget@gmail.com>
505
506
394
-* hn/reftable-no-empty-keys (2022-02-17) 7 commits
507
+* hn/reftable-no-empty-keys (2022-02-23) 7 commits
508
- reftable: rename writer_stats to reftable_writer_stats
509
- reftable: add test for length of disambiguating prefix
510
- reftable: ensure that obj_id_len is >= 2 on writing
@@ -405,89 +518,37 @@ Release tarballs are available at:
518
honor documented length limit, etc.
519
520
Will merge to 'next'?
408
- source: <pull.1185.v2.git.git.1645106124.gitgitgadget@gmail.com>
521
+ source: <pull.1185.v3.git.git.1645469170.gitgitgadget@gmail.com>
522
523
524
* ps/fetch-atomic (2022-02-17) 7 commits
412
- - fetch: make `--atomic` flag cover pruning of refs
413
- - fetch: make `--atomic` flag cover backfilling of tags
414
- - refs: add interface to iterate over queued transactional updates
415
- - fetch: report errors when backfilling tags fails
416
- - fetch: control lifecycle of FETCH_HEAD in a single place
417
- - fetch: backfill tags before setting upstream
418
- - fetch: increase test coverage of fetches
525
+ (merged to 'next' on 2022-02-18 at 3824153b23)
526
+ + fetch: make `--atomic` flag cover pruning of refs
527
+ + fetch: make `--atomic` flag cover backfilling of tags
528
+ + refs: add interface to iterate over queued transactional updates
529
+ + fetch: report errors when backfilling tags fails
530
+ + fetch: control lifecycle of FETCH_HEAD in a single place
531
+ + fetch: backfill tags before setting upstream
532
+ + fetch: increase test coverage of fetches
533
534
"git fetch" can make two separate fetches, but ref updates coming
535
from them were in two separate ref transactions under "--atomic",
536
which has been corrected.
537
424
- Will merge to 'next'.
538
+ Will merge to 'master'.
539
source: <cover.1645102965.git.ps@pks.im>
540
541
542
* rs/pcre-invalid-utf8-fix-fix (2022-02-17) 1 commit
429
- - grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround
543
+ (merged to 'next' on 2022-02-18 at 9e47d58bda)
544
+ + grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround
545
546
Workaround we have for versions of PCRE2 before their version 10.36
547
were in effect only for their versions newer than 10.36 by mistake,
548
which has been corrected.
549
435
- Will merge to 'next'.
436
- source: <4e391e2e-6561-3c2e-0306-c860a37356bc@web.de>
437
-
438
---------------------------------------------------
439
-[Stalled]
440
-
441
-* je/http-better-error-output (2021-12-03) 1 commit
442
- . http-backend: give a hint that web browser access is not supported
443
-
444
- When the http-backend program, which is the server-side component
445
- for the smart HTTP transport, sends a "404 Not found" error, we
446
- deliberately did not say anything to the requesting client. We now
447
- send a message back to the browser to tell the user that they do
448
- not want to visit the URL via their browser, instead of a totally
449
- blank page.
450
-
451
- Expecting a reroll.
452
- Breaks its self tests.
453
- cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
454
- source: <20211202102855.23907-1-jengelh@inai.de>
455
-
456
-
457
-* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
458
- - fixup! editor: allow for saving/restoring terminal state
459
- - editor: allow for saving/restoring terminal state
460
- - terminal: teach save_term to fail when not foreground
461
-
462
- Some editors are reported to leave the terminal in funny state
463
- after they exit on Windows. Work it around by saving and restoring
464
- the terminal state when needed.
465
-
466
- Expecting a reroll.
467
- cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
468
- source: <20211202035446.1154-1-carenas@gmail.com>
469
-
470
---------------------------------------------------
471
-[Cooking]
472
-
473
-* ds/mailmap (2022-02-14) 1 commit
474
- (merged to 'next' on 2022-02-14 at 1e50634951)
475
- + mailmap: change primary address for Derrick Stolee
476
-
477
- Update mailmap entries.
478
-
550
Will merge to 'master'.
480
- source: <pull.1142.git.1644857153590.gitgitgadget@gmail.com>
481
-
482
-
483
-* bc/clarify-eol-attr (2022-02-14) 1 commit
484
- (merged to 'next' on 2022-02-14 at 7e23e61f3f)
485
- + doc: clarify interaction between 'eol' and text=auto
486
-
487
- Documentation update
488
-
489
- Will merge to 'master'.
490
- source: <xmqqilth2u28.fsf@gitster.g>
551
+ source: <4e391e2e-6561-3c2e-0306-c860a37356bc@web.de>
552
553
554
* ab/date-mode-release (2022-02-16) 5 commits
@@ -504,49 +565,6 @@ Release tarballs are available at:
565
source: <cover-v3-0.5-00000000000-20220216T081203Z-avarab@gmail.com>
566
567
507
-* jc/glossary-worktree (2022-02-09) 1 commit
508
- (merged to 'next' on 2022-02-10 at d05e2b6ea3)
509
- + glossary: describe "worktree"
510
-
511
- "working tree" and "per-worktree ref" were in glossary, but
512
- "worktree" itself wasn't, which has been corrected.
513
-
514
- Will merge to 'master'.
515
- source: <xmqqczjvxy3o.fsf@gitster.g>
516
-
517
-
518
-* jd/t0015-modernize (2022-02-09) 1 commit
519
- (merged to 'next' on 2022-02-10 at a3733234c0)
520
- + t/t0015-hash.sh: remove unnecessary '\' at line end
521
-
522
- Test modernization.
523
-
524
- Will merge to 'master'.
525
- source: <20220208092339.651761-2-jaydeepjd.8914@gmail.com>
526
-
527
-
528
-* hw/t1410-adjust-test-for-reftable (2022-02-09) 2 commits
529
- (merged to 'next' on 2022-02-14 at 6b96b4faa4)
530
- + t1410: mark bufsize boundary test as REFFILES
531
- + t1410: use test-tool ref-store to inspect reflogs
532
-
533
- Fix tests that are unnecessarily specific to ref-files backend.
534
-
535
- Will merge to 'master'.
536
- source: <pull.1213.git.git.1644406180.gitgitgadget@gmail.com>
537
-
538
-
539
-* ps/fetch-optim-with-commit-graph (2022-02-10) 2 commits
540
- (merged to 'next' on 2022-02-14 at 2b331293fb)
541
- + fetch: skip computing output width when not printing anything
542
- + fetch-pack: use commit-graph when computing cutoff
543
-
544
- A couple of optimization to "git fetch".
545
-
546
- Will merge to 'master'.
547
- source: <cover.1644495978.git.ps@pks.im>
548
-
549
-
568
* pw/xdiff-alloc-fail (2022-02-16) 4 commits
569
- xdiff: handle allocation failure when merging
570
- xdiff: refactor a function
@@ -558,16 +576,6 @@ Release tarballs are available at:
576
source: <pull.1140.v2.git.1645006510.gitgitgadget@gmail.com>
577
578
561
-* sy/t0001-use-path-is-helper (2022-02-11) 1 commit
562
- (merged to 'next' on 2022-02-14 at 2f1bdb0803)
563
- + t0001: replace "test [-d|-f]" with test_path_is_* functions
564
-
565
- Test modernization.
566
-
567
- Will merge to 'master'.
568
- source: <20220121102109.433457-2-shaoxuan.yuan02@gmail.com>
569
-
570
-
579
* gc/recursive-fetch-with-unused-submodules (2022-02-10) 8 commits
580
- submodule: fix bug and remove add_submodule_odb()
581
- fetch: fetch unpopulated, changed submodules
@@ -584,76 +592,43 @@ Release tarballs are available at:
592
in the current checkout of the superproject. We now do so for all
593
submodules that have been run "git submodule init" on.
594
587
- Will merge to 'next'?
595
+ Expecting a reroll.
596
+ cf. <kl6lv8xc51ox.fsf@chooglen-macbookpro.roam.corp.google.com>
597
source: <20220210044152.78352-1-chooglen@google.com>
598
599
591
-* ah/log-no-graph (2022-02-11) 2 commits
592
- (merged to 'next' on 2022-02-14 at 6c8fd1f37f)
593
- + log: add a --no-graph option
594
- + log: fix memory leak if --graph is passed multiple times
595
-
596
- "git log --graph --graph" used to leak a graph structure, and there
597
- was no way to countermand "--graph" that appear earlier on the
598
- command line. A "--no-graph" option has been added and resource
599
- leakage has been plugged.
600
-
601
- Will merge to 'master'.
602
- source: <20220211163627.598166-2-alexhenrie24@gmail.com>
603
-
604
-
605
-* cg/t3903-modernize (2022-02-11) 1 commit
606
- - t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*
600
+* cg/t3903-modernize (2022-02-23) 3 commits
601
+ (merged to 'next' on 2022-02-23 at 0d5a844b40)
602
+ + tests: make the code more readable
603
+ + tests: allow testing if a path is truly a file or a directory
604
+ + t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*
605
606
Test modernization.
607
610
- Will merge to 'next'?
611
- source: <20220211134655.1149320-1-cogoni.guillaume@gmail.com>
612
-
613
-
614
-* ab/t0051-skip-on-non-windows (2022-02-04) 1 commit
615
- (merged to 'next' on 2022-02-10 at 3e587df1d6)
616
- + t0051: use "skip_all" under !MINGW in single-test file
617
-
618
- Conditional test update.
619
-
608
Will merge to 'master'.
621
- source: <patch-v2-1.1-1bc93bcba4b-20220204T134208Z-avarab@gmail.com>
609
+ source: <20220222215430.605254-1-cogoni.guillaume@gmail.com>
610
611
624
-* ab/hash-object-leakfix (2022-02-06) 1 commit
625
- (merged to 'next' on 2022-02-10 at 14956d3087)
626
- + hash-object: fix a trivial leak in --path
627
-
628
- Trivial leakfix.
629
-
630
- Will merge to 'master'.
631
- source: <patch-1.1-53863df1455-20220205T000422Z-avarab@gmail.com>
632
-
633
-
634
-* ab/release-transport-ls-refs-options (2022-02-06) 1 commit
635
- (merged to 'next' on 2022-02-10 at c4e57c2b29)
636
- + ls-remote & transport API: release "struct transport_ls_refs_options"
637
-
638
- Will merge to 'master'.
639
- source: <patch-1.1-e80e8f64eae-20220205T000809Z-avarab@gmail.com>
640
-
641
-
642
-* js/bisect-in-c (2022-02-09) 11 commits
612
+* js/bisect-in-c (2022-02-23) 14 commits
613
- bisect: no longer try to clean up left-over `.git/head-name` files
614
- bisect: remove Cogito-related code
645
- - Turn `git bisect` into a full built-in.
646
- - bisect--helper: using `--bisect-state` without an argument is a bug
615
+ - bisect: turn `git bisect` into a full built-in
616
- bisect: move even the option parsing to `bisect--helper`
617
+ - bisect--helper: return only correct exit codes in `cmd_*()`
618
+ - bisect--helper: move the `BISECT_STATE` case to the end
619
- bisect--helper: make `--bisect-state` optional
620
- bisect--helper: align the sub-command order with git-bisect.sh
621
+ - bisect--helper: using `--bisect-state` without an argument is a bug
622
- bisect--helper: really retire `--bisect-autostart`
623
- bisect--helper: really retire --bisect-next-check
624
- bisect--helper: retire the --no-log option
625
+ - bisect: avoid double-quoting when printing the failed command
626
- bisect run: fix the error message
627
628
Final bits of "git bisect.sh" have been rewritten in C.
656
- source: <pull.1132.git.1643328752.gitgitgadget@gmail.com>
629
+
630
+ Will merge to 'next'?
631
+ source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
632
633
634
* js/scalar-diagnose (2022-02-06) 6 commits
@@ -667,31 +642,7 @@ Release tarballs are available at:
642
source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
643
644
670
-* js/short-help-outside-repo-fix (2022-02-08) 2 commits
671
- (merged to 'next' on 2022-02-10 at a86376de89)
672
- + t0012: verify that built-ins handle `-h` even without gitdir
673
- + checkout/fetch/pull/pack-objects: allow `-h` outside a repository
674
-
675
- "git cmd -h" outside a repository should error out cleanly for many
676
- commands, but instead it hit a BUG(), which has been corrected.
677
-
678
- Will merge to 'master'.
679
- source: <pull.1139.v2.git.1644319314.gitgitgadget@gmail.com>
680
-
681
-
682
-* tb/midx-no-bitmap-for-no-objects (2022-02-09) 1 commit
683
- (merged to 'next' on 2022-02-10 at 5c501a3f80)
684
- + midx: prevent writing a .bitmap without any objects
685
-
686
- When there is no object to write .bitmap file for, "git
687
- multi-pack-index" triggered an error, instead of just skipping,
688
- which has been corrected.
689
-
690
- Will merge to 'master'.
691
- source: <abc67d757cb6b244cf54b7b030985180ce134724.1644434802.git.me@ttaylorr.com>
692
-
693
-
694
-* jc/cat-file-batch-commands (2022-02-16) 4 commits
645
+* jc/cat-file-batch-commands (2022-02-18) 4 commits
646
- cat-file: add --batch-command mode
647
- cat-file: add remove_timestamp helper
648
- cat-file: introduce batch_mode enum to replace print_contents
@@ -702,7 +653,7 @@ Release tarballs are available at:
653
modes, to allow different kinds of inquiries made.
654
655
Will merge to 'next'?
705
- source: <pull.1212.v9.git.git.1645045157.gitgitgadget@gmail.com>
656
+ source: <pull.1212.v10.git.git.1645208594.gitgitgadget@gmail.com>
657
658
659
* ar/submodule-update (2022-02-10) 20 commits
@@ -734,31 +685,6 @@ Release tarballs are available at:
685
source: <20220210092833.55360-1-chooglen@google.com>
686
687
737
-* pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits
738
- (merged to 'next' on 2022-02-10 at bd7c3615fe)
739
- + rebase -m: don't fork git checkout
740
- + rebase --apply: set ORIG_HEAD correctly
741
- + rebase --apply: fix reflog
742
- + reset_head(): take struct rebase_head_opts
743
- + rebase: cleanup reset_head() calls
744
- + create_autostash(): remove unneeded parameter
745
- + reset_head(): make default_reflog_action optional
746
- + reset_head(): factor out ref updates
747
- + reset_head(): remove action parameter
748
- + rebase --apply: don't run post-checkout hook if there is an error
749
- + rebase: do not remove untracked files on checkout
750
- + rebase: pass correct arguments to post-checkout hook
751
- + t5403: refactor rebase post-checkout hook tests
752
- + rebase: factor out checkout for up to date branch
753
-
754
- Use an internal call to reset_head() helper function instead of
755
- spawning "git checkout" in "rebase", and update code paths that are
756
- involved in the change.
757
-
758
- Will merge to 'master'.
759
- source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
760
-
761
-
688
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
689
- receive-pack: check if client is alive before completing the push
690
@@ -789,20 +715,6 @@ Release tarballs are available at:
715
source: <cover-v2-00.11-00000000000-20220204T135005Z-avarab@gmail.com>
716
717
792
-* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit
793
- (merged to 'next' on 2022-02-10 at 213f44aec8)
794
- + receive-pack: purge temporary data if no command is ready to run
795
-
796
- Check if "receive-pack" will do any ref updates (various conditions
797
- could reject a push) before received objects are taken out of the
798
- temporary directory used for quarantine purposes, so that a push
799
- that is known-to-fail will not leave crufts that a future "gc"
800
- needs to clean up.
801
-
802
- Will merge to 'master'.
803
- source: <20220129063538.24038-1-bojun.cbj@gmail.com>
804
-
805
-
718
* ja/i18n-common-messages (2022-02-04) 4 commits
719
(merged to 'next' on 2022-02-15 at 23d56641fc)
720
+ i18n: fix some misformated placeholders in command synopsis
@@ -816,7 +728,7 @@ Release tarballs are available at:
728
source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
729
730
819
-* en/merge-tree (2022-02-14) 13 commits
731
+* en/merge-tree (2022-02-23) 13 commits
732
- git-merge-tree.txt: add a section on potentional usage mistakes
733
- merge-tree: add a --allow-unrelated-histories flag
734
- merge-tree: allow `ls-files -u` style info to be NUL terminated
@@ -835,7 +747,9 @@ Release tarballs are available at:
747
tree that would be contained in the resulting merge commit, if the
748
histories leading to these two commits were to be merged, and is
749
added as a new mode of "git merge-tree" subcommand.
838
- source: <pull.1122.v4.git.1644698093.gitgitgadget@gmail.com>
750
+
751
+ Will merge to 'next'.
752
+ source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
753
754
755
* js/apply-partial-clone-filters-recursively (2022-02-09) 1 commit
@@ -901,6 +815,7 @@ Release tarballs are available at:
815
+ config: add repo_config_set_worktree_gently()
816
+ worktree: create init_worktree_config()
817
+ Documentation: add extensions.worktreeConfig details
818
+ (this branch is used by ds/worktree-docs.)
819
820
"git sparse-checkout" wants to work with per-worktree configration,
821
but did not work well in a worktree attached to a bare repository.
@@ -909,25 +824,8 @@ Release tarballs are available at:
824
source: <pull.1101.v6.git.1644269583.gitgitgadget@gmail.com>
825
826
912
-* ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits
913
- (merged to 'next' on 2022-02-10 at 4866a64508)
914
- + refs: skip hooks when deleting uncovered packed refs
915
- + refs: do not execute reference-transaction hook on packing refs
916
- + refs: demonstrate excessive execution of the reference-transaction hook
917
- + refs: allow skipping the reference-transaction hook
918
- + refs: allow passing flags when beginning transactions
919
- + refs: extract packed_refs_delete_refs() to allow control of transaction
920
-
921
- Because a deletion of ref would need to remove it from both the
922
- loose ref store and the packed ref store, a delete-ref operation
923
- that logically removes one ref may end up invoking ref-transaction
924
- hook twice, which has been corrected.
925
-
926
- Will merge to 'master'.
927
- source: <cover.1642406989.git.ps@pks.im>
928
-
929
-
930
-* en/present-despite-skipped (2022-01-14) 6 commits
827
+* en/present-despite-skipped (2022-02-20) 7 commits
828
+ - Provide config option to expect files outside sparse patterns
829
(merged to 'next' on 2022-02-15 at 960873fdad)
830
+ Accelerate clear_skip_worktree_from_present_files() by caching
831
+ Update documentation related to sparsity and the skip-worktree bit
@@ -941,37 +839,12 @@ Release tarballs are available at:
839
harder to correct. Automatically detecting and correcting the marking
840
of such files has been added to avoid these problems.
841
944
- Will merge to 'master'.
945
- cf. <20220204081336.3194538-1-newren@gmail.com>
842
+ On hold.
843
+ cf. <YhBNgUFnujFGVcRo@google.com>
844
+ cf. <CABPp-BFEt1zxR6xoZmwmY2dtXkK+ti+g-1DHZCgeP2VpzWqqyA@mail.gmail.com>
845
source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
846
847
949
-* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2022-02-11) 1 commit
950
- (merged to 'next' on 2022-02-14 at 9abd0dce80)
951
- + fetch-pack: parameterize message containing 'ready' keyword
952
-
953
- L10n support for a few error messages.
954
-
955
- Will merge to 'master'.
956
- source: <20211222075805.19027-1-bagasdotme@gmail.com>
957
-
958
-
959
-* gc/branch-recurse-submodules (2022-02-04) 7 commits
960
- (merged to 'next' on 2022-02-10 at b54367ff92)
961
- + branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks
962
- + branch: add --recurse-submodules option for branch creation
963
- + builtin/branch: consolidate action-picking logic in cmd_branch()
964
- + branch: add a dry_run parameter to create_branch()
965
- + branch: make create_branch() always create a branch
966
- + branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
967
- + Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
968
-
969
- "git branch" learned the "--recurse-submodules" option.
970
-
971
- Will merge to 'master'.
972
- source: <20220129000446.99261-1-chooglen@google.com>
973
-
974
-
848
* ab/grep-patterntype (2022-02-15) 10 commits
849
(merged to 'next' on 2022-02-16 at 64222759a2)
850
+ grep: simplify config parsing and option parsing