What's cooking (2022/03 #05)
Junio C Hamano committed
Mar 23, 2022 at 15:43 UTC
0e7900e9bb6090153650369815c9484ae53f5013
1 file changed
+446
-550
whats-cooking.txt
+446
-550
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2022, #04; Thu, 17)
4
-X-master-at: 74cc1aa55f30ed76424a0e7226ab519aa6265061
5
-X-next-at: ce97038cc250ba04e5362ab4f7996e3fe17ab879
3
+Subject: What's cooking in git.git (Mar 2022, #05; Wed, 23)
4
+X-master-at: a68dfadae5e95c7f255cf38c9efdcbc2e36d1931
5
+X-next-at: c54b8eb302ffb72f31e73a26044c8a864e2cb307
6
7
-What's cooking in git.git (Mar 2022, #04; Thu, 17)
7
+What's cooking in git.git (Mar 2022, #05; Wed, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,306 +49,319 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[Graduated to 'master']
51
52
-* ab/grep-patterntype (2022-03-04) 1 commit
53
- (merged to 'next' on 2022-03-08 at 407dcd1f5d)
54
- + log tests: fix "abort tests early" regression in ff37a60c369
55
-
56
- Test fix-up for a topic already in master.
57
- source: <patch-1.1-3b41c1a26d4-20220304T093323Z-avarab@gmail.com>
58
-
59
-
60
-* ab/keep-git-exit-codes-in-tests (2022-03-07) 15 commits
61
- (merged to 'next' on 2022-03-08 at bf89509f4c)
62
- + rev-list simplify tests: don't ignore "git" exit code
63
- + checkout tests: don't ignore "git <cmd>" exit code
64
- + apply tests: don't ignore "git ls-files" exit code, drop sub-shell
65
- + gettext tests: don't ignore "test-tool regex" exit code
66
- + rev-list tests: don't hide abort() in "test_expect_failure"
67
- + diff tests: don't ignore "git rev-list" exit code
68
- + notes tests: don't ignore "git" exit code
69
- + rev-parse tests: don't ignore "git reflog" exit code
70
- + merge tests: use "test_must_fail" instead of ad-hoc pattern
71
- + apply tests: use "test_must_fail" instead of ad-hoc pattern
72
- + diff tests: don't ignore "git diff" exit code in "read" loop
73
- + diff tests: don't ignore "git diff" exit code
74
- + read-tree tests: check "diff-files" exit code on failure
75
- + tests: use "test_stdout_line_count", not "test $(git [...] | wc -l)"
76
- + tests: change some 'test $(git) = "x"' to test_cmp
77
-
78
- Updates tests around the use of "test $(git cmd) = constant".
79
- source: <cover-v2-00.15-00000000000-20220307T124817Z-avarab@gmail.com>
80
-
81
-
82
-* ab/object-file-api-updates (2022-02-25) 12 commits
83
- (merged to 'next' on 2022-03-08 at 7fc151ce67)
84
- + object-file API: pass an enum to read_object_with_reference()
85
- + object-file.c: add a literal version of write_object_file_prepare()
86
- + object-file API: have hash_object_file() take "enum object_type"
87
- + object API: rename hash_object_file_literally() to write_*()
88
- + object-file API: split up and simplify check_object_signature()
89
- + object API users + docs: check <0, not !0 with check_object_signature()
90
- + object API docs: move check_object_signature() docs to cache.h
91
- + object API: correct "buf" v.s. "map" mismatch in *.c and *.h
92
- + object-file API: have write_object_file() take "enum object_type"
93
- + object-file API: add a format_object_header() function
94
- + object-file API: return "void", not "int" from hash_object_file()
95
- + object-file.c: split up declaration of unrelated variables
96
-
97
- Object-file API shuffling.
98
- source: <cover-v3-00.12-00000000000-20220204T234435Z-avarab@gmail.com>
99
-
52
+* ab/plug-random-leaks (2022-03-17) 2 commits
53
+ (merged to 'next' on 2022-03-17 at 381101b075)
54
+ + diff.c: fix a double-free regression in a18d66cefb
55
+ + tests: demonstrate "show --word-diff --color-moved" regression
56
101
-* ab/racy-hooks (2022-03-07) 2 commits
102
- (merged to 'next' on 2022-03-08 at 07188be733)
103
- + hooks: fix an obscure TOCTOU "did we just run a hook?" race
104
- + merge: don't run post-hook logic on --no-verify
105
-
106
- Code clean-up to allow callers of run_commit_hook() to learn if it
107
- got "success" because the hook succeeded or because there wasn't
108
- any hook.
109
- source: <cover-v2-0.2-00000000000-20220307T123244Z-avarab@gmail.com>
110
-
111
-
112
-* ab/string-list-count-in-size-t (2022-03-07) 2 commits
113
- (merged to 'next' on 2022-03-08 at 3458b5c278)
114
- + string-list API: change "nr" and "alloc" to "size_t"
115
- + gettext API users: don't explicitly cast ngettext()'s "n"
116
-
117
- Count string_list items in size_t, not "unsigned int".
118
- source: <cover-v2-0.2-00000000000-20220307T152316Z-avarab@gmail.com>
119
-
120
-
121
-* ds/commit-graph-gen-v2-fixes (2022-03-07) 6 commits
122
- (merged to 'next' on 2022-03-08 at 36dd214bc2)
123
- + commit-graph: declare bankruptcy on GDAT chunks
124
- + commit-graph: fix generation number v2 overflow values
125
- + commit-graph: start parsing generation v2 (again)
126
- + commit-graph: fix ordering bug in generation numbers
127
- + t5318: extract helpers to lib-commit-graph.sh
128
- + test-read-graph: include extra post-parse info
129
-
130
- Fixes to the way generation number v2 in the commit-graph files are
131
- (not) handled.
132
- source: <pull.1163.v3.git.1646164112.gitgitgadget@gmail.com>
133
-
134
-
135
-* jc/stash-drop (2022-03-02) 3 commits
136
- (merged to 'next' on 2022-03-08 at 4073dcf05c)
137
- + stash: call reflog_delete() in reflog.c
138
- + reflog: libify delete reflog function and helpers
139
- + stash: add tests to ensure reflog --rewrite --updatref behavior
140
-
141
- "git stash drop" is reimplemented as an internal call to
142
- reflog_delete() function, instead of invoking "git reflog delete"
143
- via run_command() API.
144
- source: <pull.1218.v4.git.git.1646260044.gitgitgadget@gmail.com>
145
-
146
-
147
-* mf/fix-type-in-config-h (2022-03-03) 1 commit
148
- (merged to 'next' on 2022-03-08 at a914e267f2)
149
- + config: correct "--type" option in "git config -h" output
150
-
151
- "git config -h" did not describe the "--type" option correctly.
152
- source: <pull.1220.v2.git.git.1646368313714.gitgitgadget@gmail.com>
153
-
154
-
155
-* ps/fetch-mirror-optim (2022-03-01) 6 commits
156
- (merged to 'next' on 2022-03-08 at 60aae8731c)
157
- + refs/files-backend: optimize reading of symbolic refs
158
- + remote: read symbolic refs via `refs_read_symbolic_ref()`
159
- + refs: add ability for backends to special-case reading of symbolic refs
160
- + fetch: avoid lookup of commits when not appending to FETCH_HEAD
161
- + upload-pack: look up "want" lines via commit-graph
162
- + Merge branch 'ps/fetch-atomic' into ps/fetch-mirror-optim
163
-
164
- Various optimization for "git fetch".
165
- source: <cover.1646127015.git.ps@pks.im>
166
-
167
-
168
-* tb/rename-remote-progress (2022-03-03) 2 commits
169
- (merged to 'next' on 2022-03-08 at adff4dbd86)
170
- + builtin/remote.c: show progress when renaming remote references
171
- + builtin/remote.c: parse options in 'rename'
172
-
173
- "git remote rename A B", depending on the number of remote-tracking
174
- refs involved, takes long time renaming them. The command has been
175
- taught to show progress bar while making the user wait.
176
- source: <cover.1646346286.git.me@ttaylorr.com>
57
+ Double-free fix for a recently merged topic.
58
+ source: <cover-v2-0.2-00000000000-20220317T144838Z-avarab@gmail.com>
59
60
179
-* tk/empty-untracked-cache (2022-02-28) 3 commits
180
- (merged to 'next' on 2022-03-08 at d3749d5850)
181
- + untracked-cache: write index when populating empty untracked cache
182
- + t7519: populate untracked cache before test
183
- + t7519: avoid file to index mtime race for untracked cache
184
-
185
- The untracked cache newly computed weren't written back to the
186
- on-disk index file when there is no other change to the index,
187
- which has been corrected.
188
- source: <pull.986.v3.git.1645999021.gitgitgadget@gmail.com>
61
+* ab/reflog-prep-fix (2022-03-13) 1 commit
62
+ (merged to 'next' on 2022-03-15 at c9ef333999)
63
+ + reflog: don't be noisy on empty reflogs
64
65
+ Regression fix.
66
+ source: <de5e2b0e290791d0a4f58a893d8571b5fc8c4f1a.1646952843.git.avarab@gmail.com>
67
191
-* tk/t7063-chmtime-dirs-too (2022-03-01) 2 commits
192
- (merged to 'next' on 2022-03-08 at 99c954903d)
193
- + t7063: mtime-mangling instead of delays in untracked cache testing
194
- + t/helper/test-chmtime: update mingw to support chmtime on directories
68
196
- Teach "test-chmtime" to work on a directory and use it to avoid
197
- having to wait for a second in a few places in tests.
198
- source: <pull.1166.v3.git.1646201124.gitgitgadget@gmail.com>
69
+* ac/test-lazy-fetch (2022-03-16) 1 commit
70
+ (merged to 'next' on 2022-03-17 at 11eb486b7f)
71
+ + partial-clone: add a partial-clone test case
72
73
+ A new test to ensure a lazy fetching is not triggered when it
74
+ should not be.
75
+ source: <pull.1175.v2.git.1647423969576.gitgitgadget@gmail.com>
76
201
-* vd/sparse-read-tree (2022-03-01) 8 commits
202
- (merged to 'next' on 2022-03-08 at 037c187db2)
203
- + read-tree: make three-way merge sparse-aware
204
- + read-tree: make two-way merge sparse-aware
205
- + read-tree: narrow scope of index expansion for '--prefix'
206
- + read-tree: integrate with sparse index
207
- + read-tree: expand sparse checkout test coverage
208
- + read-tree: explicitly disallow prefixes with a leading '/'
209
- + status: fix nested sparse directory diff in sparse index
210
- + sparse-index: prevent repo root from becoming sparse
77
212
- "git read-tree" has been made to be aware of the sparse-index
213
- feature.
214
- source: <pull.1157.v3.git.1646166271.gitgitgadget@gmail.com>
78
+* bc/block-sha1-without-gcc-asm-extension (2022-03-10) 1 commit
79
+ (merged to 'next' on 2022-03-15 at e285d9988f)
80
+ + block-sha1: remove use of obsolete x86 assembly
81
216
---------------------------------------------------
217
-[New Topics]
82
+ Get rid of one use of __asm__() GCC extension that does not help us
83
+ much these days, which has an added advantage of not having to
84
+ worry about -pedantic complaining.
85
+ source: <20220310174750.4166514-1-sandals@crustytoothpaste.net>
86
219
-* ps/repack-with-server-info (2022-03-14) 2 commits
220
- - repack: add config to skip updating server info
221
- - repack: refactor to avoid double-negation of update-server-info
87
223
- "git repack" learned a new configuration to disable triggering of
224
- age-old "update-server-info" command, which is rarely useful these
225
- days.
88
+* dc/complete-restore (2022-03-15) 1 commit
89
+ (merged to 'next' on 2022-03-17 at 34a4fd8796)
90
+ + completion: tab completion of filenames for 'git restore'
91
227
- Will merge to 'next'.
228
- source: <cover.1647243508.git.ps@pks.im>
92
+ The command line completion support (in contrib/) learns to give
93
+ modified paths to the "git restore" command.
94
+ source: <pull.1227.v3.git.git.1647382437475.gitgitgadget@gmail.com>
95
96
97
* ds/doc-maintenance-synopsis-fix (2022-03-15) 1 commit
232
- - maintenance: fix synopsis in documentation
98
+ (merged to 'next' on 2022-03-17 at eb26e034a3)
99
+ + maintenance: fix synopsis in documentation
100
101
Doc update.
235
-
236
- Will merge to 'next'.
102
source: <pull.1178.git.1647366104967.gitgitgadget@gmail.com>
103
104
105
+* ds/partial-bundles (2022-03-09) 13 commits
106
+ (merged to 'next' on 2022-03-13 at 03529eaa59)
107
+ + clone: fail gracefully when cloning filtered bundle
108
+ + bundle: unbundle promisor packs
109
+ + bundle: create filtered bundles
110
+ + rev-list: move --filter parsing into revision.c
111
+ + bundle: parse filter capability
112
+ + list-objects: handle NULL function pointers
113
+ + MyFirstObjectWalk: update recommended usage
114
+ + list-objects: consolidate traverse_commit_list[_filtered]
115
+ + pack-bitmap: drop filter in prepare_bitmap_walk()
116
+ + pack-objects: use rev.filter when possible
117
+ + revision: put object filter into struct rev_info
118
+ + list-objects-filter-options: create copy helper
119
+ + index-pack: document and test the --promisor option
120
+ (this branch is used by ds/bundle-uri.)
121
+
122
+ Bundle file format gets extended to allow a partial bundle,
123
+ filtered by similar criteria you would give when making a
124
+ partial/lazy clone.
125
+ source: <pull.1159.v4.git.1646841703.gitgitgadget@gmail.com>
126
+
127
+
128
+* ep/remove-duplicated-includes (2022-03-14) 6 commits
129
+ (merged to 'next' on 2022-03-15 at 0f87385b56)
130
+ + attr.h: remove duplicate struct definition
131
+ + t/helper/test-run-command.c: delete duplicate include
132
+ + builtin/stash.c: delete duplicate include
133
+ + builtin/sparse-checkout.c: delete duplicate include
134
+ + builtin/gc.c: delete duplicate include
135
+ + attr.c: delete duplicate include
136
+
137
+ Code clean-up.
138
+ source: <20220313195536.224075-1-gitter.spiros@gmail.com>
139
+
140
+
141
+* ep/t6423-modernize (2022-03-13) 1 commit
142
+ (merged to 'next' on 2022-03-15 at d37f7359bf)
143
+ + t6423-merge-rename-directories.sh: use the $(...) construct
144
+
145
+ Code clean-up.
146
+ source: <20220313172829.215517-1-gitter.spiros@gmail.com>
147
+
148
+
149
+* ep/test-malloc-check-with-glibc-2.34 (2022-03-09) 2 commits
150
+ (merged to 'next' on 2022-03-12 at 13ed9014e6)
151
+ + test-lib: declare local variables as local
152
+ (merged to 'next' on 2022-03-08 at 810ac5a1d3)
153
+ + test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34
154
+
155
+ The method to trigger malloc check used in our tests no longer work
156
+ with newer versions of glibc.
157
+ source: <81f43fbefde84ab7af9ee2ac760845b728a48ab5.1646861976.git.git@grubix.eu>
158
+
159
+
160
+* gc/submodule-update-part1 (2022-03-04) 13 commits
161
+ (merged to 'next' on 2022-03-15 at 92911dced9)
162
+ + submodule--helper update-clone: check for --filter and --init
163
+ + submodule update: add tests for --filter
164
+ + submodule--helper: remove ensure-core-worktree
165
+ + submodule--helper update-clone: learn --init
166
+ + submodule--helper: allow setting superprefix for init_submodule()
167
+ + submodule--helper: refactor get_submodule_displaypath()
168
+ + submodule--helper run-update-procedure: learn --remote
169
+ + submodule--helper: don't use bitfield indirection for parse_options()
170
+ + submodule--helper: get remote names from any repository
171
+ + submodule--helper run-update-procedure: remove --suboid
172
+ + submodule--helper: reorganize code for sh to C conversion
173
+ + submodule--helper: remove update-module-mode
174
+ + submodule tests: test for init and update failure output
175
+ (this branch is used by gc/submodule-update-part2.)
176
+
177
+ Rewrite of "git submodule update" in C (early part).
178
+ source: <20220305001401.20888-1-chooglen@google.com>
179
+
180
+
181
* jc/cat-file-batch-default-format-optim (2022-03-15) 1 commit
241
- - cat-file: skip expanding default format
182
+ (merged to 'next' on 2022-03-17 at 2d7f0efefa)
183
+ + cat-file: skip expanding default format
184
185
Optimize away strbuf_expand() call with a hardcoded formatting logic
186
specific for the default format in the --batch and --batch-check
187
options of "git cat-file".
246
-
247
- Will merge to 'next'?
188
source: <pull.1221.v4.git.git.1647312036664.gitgitgadget@gmail.com>
189
190
251
-* ac/test-lazy-fetch (2022-03-16) 1 commit
252
- - partial-clone: add a partial-clone test case
191
+* jd/userdiff-kotlin (2022-03-12) 1 commit
192
+ (merged to 'next' on 2022-03-15 at 10fabd722a)
193
+ + userdiff: add builtin diff driver for kotlin language.
194
254
- A new test to ensure a lazy fetching is not triggered when it
255
- should not be.
195
+ A new built-in userdiff driver for kotlin.
196
+ source: <20220312044832.718356-1-jaydeepjd.8914@gmail.com>
197
257
- Will merge to 'next'.
258
- source: <pull.1175.v2.git.1647423969576.gitgitgadget@gmail.com>
198
199
+* jk/name-rev-w-genno (2022-03-13) 1 commit
200
+ (merged to 'next' on 2022-03-15 at b370601916)
201
+ + name-rev: use generation numbers if available
202
261
-* bc/stash-export (2022-03-16) 6 commits
262
- - doc: add stash export and import to docs
263
- - builtin/stash: provide a way to import stashes from a ref
264
- - builtin/stash: provide a way to export stashes to a ref
265
- - object-name: make get_oid quietly return an error
266
- - builtin/stash: fill in all commit data
267
- - builtin/stash: factor out generic function to look up stash info
203
+ "git name-rev" learned to use the generation numbers when setting
204
+ the lower bound of searching commits used to explain the revision,
205
+ when available, instead of committer time.
206
+ source: <20220312000015.3643427-1-jacob.e.keller@intel.com>
207
269
- A mechanism to export and import stash entries to and from a normal
270
- commit to transfer it across repositories has been introduced.
208
272
- Expecting a reroll.
273
- source: <20220310173236.4165310-1-sandals@crustytoothpaste.net>
209
+* js/in-place-reverse-in-sequencer (2022-03-16) 1 commit
210
+ (merged to 'next' on 2022-03-17 at e69c91c5f5)
211
+ + sequencer: use reverse_commit_list() helper
212
213
+ Code clean-up.
214
+ source: <pull.1177.v3.git.1647429623830.gitgitgadget@gmail.com>
215
276
-* dc/complete-restore (2022-03-15) 1 commit
277
- - completion: tab completion of filenames for 'git restore'
216
279
- The command line completion support (in contrib/) learns to give
280
- modified paths to the "git restore" command.
217
+* jy/gitweb-no-need-for-meta (2022-03-08) 2 commits
218
+ (merged to 'next' on 2022-03-13 at 1e8d643130)
219
+ + gitweb: remove invalid http-equiv="content-type"
220
+ + comment: fix typo
221
282
- Will merge to 'next'?
283
- source: <pull.1227.v3.git.git.1647382437475.gitgitgadget@gmail.com>
222
+ Remove unneeded <meta http-equiv=content-type...> from gitweb
223
+ output.
224
+ source: <20220308155612.105957-3-jason@jasonyundt.email>
225
226
286
-* gc/submodule-update-part2 (2022-03-16) 8 commits
287
- - submodule--helper: remove forward declaration
288
- - submodule: move core cmd_update() logic to C
289
- - submodule--helper: reduce logic in run_update_procedure()
290
- - submodule--helper: teach update_data more options
291
- - builtin/submodule--helper.c: rename option struct to "opt"
292
- - submodule update: use die_message()
293
- - submodule--helper: run update using child process struct
294
- - Merge branch 'gc/submodule-update-part1' into gc/submodule-update-part2
295
- (this branch uses gc/submodule-update-part1.)
227
+* ps/repack-with-server-info (2022-03-14) 2 commits
228
+ (merged to 'next' on 2022-03-17 at aafa287b91)
229
+ + repack: add config to skip updating server info
230
+ + repack: refactor to avoid double-negation of update-server-info
231
297
- Move more "git submodule update" to C.
298
- source: <20220315210925.79289-1-chooglen@google.com>
232
+ "git repack" learned a new configuration to disable triggering of
233
+ age-old "update-server-info" command, which is rarely useful these
234
+ days.
235
+ source: <cover.1647243508.git.ps@pks.im>
236
237
301
-* js/in-place-reverse-in-sequencer (2022-03-16) 1 commit
302
- - sequencer: use reverse_commit_list() helper
238
+* pw/single-key-interactive (2022-02-23) 4 commits
239
+ (merged to 'next' on 2022-03-13 at 02fd6aca2f)
240
+ + add -p: disable stdin buffering when interactive.singlekey is set
241
+ + terminal: set VMIN and VTIME in non-canonical mode
242
+ + terminal: pop signal handler when terminal is restored
243
+ + terminal: always reset terminal when reading without echo
244
+ (this branch is used by pw/add-p-single-key.)
245
+
246
+ The single-key interactive operation used by "git add -p" has been
247
+ made more robust.
248
+ source: <pull.1146.v2.git.1645556015.gitgitgadget@gmail.com>
249
+
250
+
251
+* sm/no-git-in-upstream-of-pipe-in-tests (2022-03-12) 3 commits
252
+ (merged to 'next' on 2022-03-12 at 9e6f538b36)
253
+ + t0030-t0050: avoid pipes with Git on LHS
254
+ + t0001-t0028: avoid pipes with Git on LHS
255
+ (merged to 'next' on 2022-03-08 at 3ff4e5c09c)
256
+ + t0003: avoid pipes with Git on LHS
257
+
258
+ Test fixes.
259
+ source: <20220223115347.3083-1-shivam828787@gmail.com>
260
+
261
+--------------------------------------------------
262
+[New Topics]
263
+
264
+* ab/refs-various-fixes (2022-03-17) 5 commits
265
+ (merged to 'next' on 2022-03-18 at d65ed663a7)
266
+ + refs debug: add a wrapper for "read_symbolic_ref"
267
+ + packed-backend: remove stub BUG(...) functions
268
+ + misc *.c: use designated initializers for struct assignments
269
+ + refs: use designated initializers for "struct ref_iterator_vtable"
270
+ + refs: use designated initializers for "struct ref_storage_be"
271
272
Code clean-up.
273
274
+ Will merge to 'master'.
275
+ source: <cover-0.5-00000000000-20220317T171618Z-avarab@gmail.com>
276
+
277
+
278
+* ab/reflog-parse-options (2022-03-23) 8 commits
279
+ - reflog [show]: display sensible -h output
280
+ - reflog: convert to parse_options() API
281
+ - reflog exists: use parse_options() API
282
+ - git reflog [expire|delete]: make -h output consistent with SYNOPSIS
283
+ - reflog: move "usage" variables and use macros
284
+ - reflog tests: add missing "git reflog exists" tests
285
+ - reflog: refactor cmd_reflog() to "if" branches
286
+ - reflog.c: indent argument lists
287
+
288
+ "git reflog" command now uses parse-options API to parse its
289
+ command line options.
290
+
291
+ Will merge to 'next'?
292
+ source: <cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com>
293
+
294
+
295
+* jt/reset-grafts-when-resetting-shallow (2022-03-17) 1 commit
296
+ (merged to 'next' on 2022-03-21 at 7030392f37)
297
+ + shallow: reset commit grafts when shallow is reset
298
+
299
+ When "shallow" information is updated, we forgot to update the
300
+ in-core equivalent, which has been corrected.
301
+
302
+ Will merge to 'master'.
303
+ source: <20220317182448.1633847-1-jonathantanmy@google.com>
304
+
305
+
306
+* ab/make-optim-noop (2022-03-21) 1 commit
307
+ (merged to 'next' on 2022-03-23 at ea8e0bdc37)
308
+ + Makefile: use ' ', not non-existing $(wspfx_SQ)
309
+
310
+ A micro fix to a topic earlier merged to 'master'
311
+
312
+ Will merge to 'master'.
313
+ source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com>
314
+
315
+
316
+* kf/p4-multiple-remotes (2022-03-21) 1 commit
317
+ - git-p4: fix issue with multiple perforce remotes
318
+
319
+ source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
320
+
321
+
322
+* ab/racy-hooks (2022-03-23) 1 commit
323
+ - hooks: fix "invoked hook" regression in a8cc5943338
324
+
325
Will merge to 'next'.
307
- source: <pull.1177.v3.git.1647429623830.gitgitgadget@gmail.com>
326
+ source: <patch-1.1-d0c9b430b2c-20220321T230933Z-avarab@gmail.com>
327
328
310
-* ns/batch-fsync (2022-03-16) 8 commits
311
- - core.fsyncmethod: performance tests for add and stash
312
- - core.fsyncmethod: tests for batch mode
313
- - core.fsync: use batch mode and sync loose objects by default on Windows
314
- - unpack-objects: use the bulk-checkin infrastructure
315
- - update-index: use the bulk-checkin infrastructure
316
- - core.fsyncmethod: batched disk flushes for loose-objects
317
- - bulk-checkin: rename 'state' variable and separate 'plugged' boolean
318
- - Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
319
- (this branch uses ns/core-fsyncmethod.)
329
+* ds/partial-bundle-more (2022-03-23) 5 commits
330
+ - bundle: output hash information in 'verify'
331
+ - bundle: move capabilities to end of 'verify'
332
+ - pack-objects: parse --filter directly into revs.filter
333
+ - pack-objects: move revs out of get_object_list()
334
+ - list-objects-filter: remove CL_ARG__FILTER
335
321
- Introduce a filesystem-dependent mechanism to optimize the way the
322
- bits for many loose object files are ensured to hit the disk
323
- platter.
336
+ Code clean-up.
337
325
- Needs review.
326
- source: <pull.1134.git.1647379859.gitgitgadget@gmail.com>
338
+ Will merge to 'next'?
339
+ source: <pull.1186.git.1647970119.gitgitgadget@gmail.com>
340
341
329
-* vd/cache-bottom-fix (2022-03-16) 3 commits
330
- . Revert "unpack-trees: improve performance of next_cache_entry"
331
- . unpack-trees: increment cache_bottom for sparse directories
332
- . t1092: add sparse directory before cone in test repo
342
+* fr/vimdiff-layout (2022-03-23) 3 commits
343
+ - vimdiff: integrate layout tests in the unit tests framework ('t' folder)
344
+ - vimdiff: add tool documentation
345
+ - vimdiff: new implementation with layout support
346
334
- Correct a bug in unpack-trees introduced earlier.
347
+ Reimplement "vimdiff[123]" mergetool drivers with a more generic
348
+ layout mechanism.
349
336
- By itself this passes its tests, but when merged with other topics
337
- into 'seen', the self-test seems to fail.
338
- source: <pull.1179.git.1647461522.gitgitgadget@gmail.com>
350
+ Will merge to 'next'?
351
+ source: <20220319091141.4911-1-greenfoo@u92.eu>
352
353
--------------------------------------------------
354
[Stalled]
355
356
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
344
- - receive-pack: check if client is alive before completing the push
357
+ . receive-pack: check if client is alive before completing the push
358
359
"git push" may be killed by the user when the server side has
360
finished receiving all data and is about to commit the result.
361
Give the latter a better chance to notice such situation and abort
362
processing the ref updates.
363
351
- Needs more work?
364
+ Will discard; getting tired of waiting
365
cf. <220204.864k5e4yvf.gmgdl@evledraar.gmail.com>
366
source: <20220128194811.3396281-1-robin.jarry@6wind.com>
367
@@ -384,69 +397,96 @@ Release tarballs are available at:
397
--------------------------------------------------
398
[Cooking]
399
387
-* bc/block-sha1-without-gcc-asm-extension (2022-03-10) 1 commit
388
- (merged to 'next' on 2022-03-15 at e285d9988f)
389
- + block-sha1: remove use of obsolete x86 assembly
400
+* bc/stash-export (2022-03-16) 6 commits
401
+ - doc: add stash export and import to docs
402
+ - builtin/stash: provide a way to import stashes from a ref
403
+ - builtin/stash: provide a way to export stashes to a ref
404
+ - object-name: make get_oid quietly return an error
405
+ - builtin/stash: fill in all commit data
406
+ - builtin/stash: factor out generic function to look up stash info
407
391
- Get rid of one use of __asm__() GCC extension that does not help us
392
- much these days, which has an added advantage of not having to
393
- worry about -pedantic complaining.
408
+ A mechanism to export and import stash entries to and from a normal
409
+ commit to transfer it across repositories has been introduced.
410
395
- Will merge to 'master'.
396
- source: <20220310174750.4166514-1-sandals@crustytoothpaste.net>
411
+ Expecting a reroll.
412
+ source: <20220310173236.4165310-1-sandals@crustytoothpaste.net>
413
414
399
-* jy/gitweb-no-need-for-meta (2022-03-08) 2 commits
400
- (merged to 'next' on 2022-03-13 at 1e8d643130)
401
- + gitweb: remove invalid http-equiv="content-type"
402
- + comment: fix typo
415
+* gc/submodule-update-part2 (2022-03-16) 8 commits
416
+ - submodule--helper: remove forward declaration
417
+ - submodule: move core cmd_update() logic to C
418
+ - submodule--helper: reduce logic in run_update_procedure()
419
+ - submodule--helper: teach update_data more options
420
+ - builtin/submodule--helper.c: rename option struct to "opt"
421
+ - submodule update: use die_message()
422
+ - submodule--helper: run update using child process struct
423
+ - Merge branch 'gc/submodule-update-part1' into gc/submodule-update-part2
424
+
425
+ Move more "git submodule update" to C.
426
+
427
+ Will merge to 'next'?
428
+ source: <20220315210925.79289-1-chooglen@google.com>
429
+
430
+
431
+* ns/batch-fsync (2022-03-21) 8 commits
432
+ - core.fsyncmethod: performance tests for add and stash
433
+ - core.fsyncmethod: tests for batch mode
434
+ - core.fsync: use batch mode and sync loose objects by default on Windows
435
+ - unpack-objects: use the bulk-checkin infrastructure
436
+ - update-index: use the bulk-checkin infrastructure
437
+ - core.fsyncmethod: batched disk flushes for loose-objects
438
+ - bulk-checkin: rename 'state' variable and separate 'plugged' boolean
439
+ - Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
440
+ (this branch uses ns/core-fsyncmethod.)
441
+
442
+ Introduce a filesystem-dependent mechanism to optimize the way the
443
+ bits for many loose object files are ensured to hit the disk
444
+ platter.
445
+ source: <pull.1134.v2.git.1647760560.gitgitgadget@gmail.com>
446
404
- Remove unneeded <meta http-equiv=content-type...> from gitweb
405
- output.
447
+
448
+* vd/cache-bottom-fix (2022-03-17) 3 commits
449
+ (merged to 'next' on 2022-03-21 at 6760b84f38)
450
+ + Revert "unpack-trees: improve performance of next_cache_entry"
451
+ + unpack-trees: increment cache_bottom for sparse directories
452
+ + t1092: add sparse directory before cone in test repo
453
+
454
+ Correct a bug in unpack-trees introduced earlier.
455
456
Will merge to 'master'.
408
- source: <20220308155612.105957-3-jason@jasonyundt.email>
457
+ source: <pull.1179.v2.git.1647532536.gitgitgadget@gmail.com>
458
459
460
* ns/core-fsyncmethod (2022-03-15) 6 commits
412
- - core.fsync: documentation and user-friendly aggregate options
413
- - core.fsync: new option to harden the index
414
- - core.fsync: add configuration parsing
415
- - core.fsync: introduce granular fsync control infrastructure
416
- - core.fsyncmethod: add writeout-only mode
417
- - wrapper: make inclusion of Windows csprng header tightly scoped
461
+ (merged to 'next' on 2022-03-17 at c8a52f8cbe)
462
+ + core.fsync: documentation and user-friendly aggregate options
463
+ + core.fsync: new option to harden the index
464
+ + core.fsync: add configuration parsing
465
+ + core.fsync: introduce granular fsync control infrastructure
466
+ + core.fsyncmethod: add writeout-only mode
467
+ + wrapper: make inclusion of Windows csprng header tightly scoped
468
(this branch is used by ns/batch-fsync and ps/fsync-refs.)
469
470
Replace core.fsyncObjectFiles with two new configuration variables,
471
core.fsync and core.fsyncMethod.
472
423
- Will merge to 'next'.
473
+ Will merge to 'master'.
474
source: <pull.1093.v6.git.1646952204.gitgitgadget@gmail.com>
475
476
477
* pw/add-p-single-key (2022-03-16) 5 commits
428
- - terminal: restore settings on SIGTSTP
429
- - terminal: work around macos poll() bug
430
- - terminal: don't assume stdin is /dev/tty
431
- - terminal: use flags for save_term()
432
- - Merge branch 'pw/single-key-interactive' into pw/add-p-single-key
433
- (this branch uses pw/single-key-interactive.)
478
+ (merged to 'next' on 2022-03-23 at a00396d9a1)
479
+ + terminal: restore settings on SIGTSTP
480
+ + terminal: work around macos poll() bug
481
+ + terminal: don't assume stdin is /dev/tty
482
+ + terminal: use flags for save_term()
483
+ + Merge branch 'pw/single-key-interactive' into pw/add-p-single-key
484
485
Finishing touches to C rewrite of "git add -i" in single-key
486
interactive mode.
487
438
- Will merge to 'next'?
439
- source: <20220316185405.29551-1-phillip.wood123@gmail.com>
440
-
441
-
442
-* ab/reflog-prep-fix (2022-03-13) 1 commit
443
- (merged to 'next' on 2022-03-15 at c9ef333999)
444
- + reflog: don't be noisy on empty reflogs
445
-
446
- Regression fix.
447
-
488
Will merge to 'master'.
449
- source: <de5e2b0e290791d0a4f58a893d8571b5fc8c4f1a.1646952843.git.avarab@gmail.com>
489
+ source: <20220316185405.29551-5-phillip.wood123@gmail.com>
490
491
492
* en/sparse-cone-becomes-default (2022-03-13) 9 commits
@@ -463,96 +503,56 @@ Release tarballs are available at:
503
source: <pull.1148.v2.git.1647054681.gitgitgadget@gmail.com>
504
505
466
-* ep/remove-duplicated-includes (2022-03-14) 6 commits
467
- (merged to 'next' on 2022-03-15 at 0f87385b56)
468
- + attr.h: remove duplicate struct definition
469
- + t/helper/test-run-command.c: delete duplicate include
470
- + builtin/stash.c: delete duplicate include
471
- + builtin/sparse-checkout.c: delete duplicate include
472
- + builtin/gc.c: delete duplicate include
473
- + attr.c: delete duplicate include
474
-
475
- Code clean-up.
476
-
477
- Will merge to 'master'.
478
- source: <20220313195536.224075-1-gitter.spiros@gmail.com>
479
-
480
-
481
-* ep/t6423-modernize (2022-03-13) 1 commit
482
- (merged to 'next' on 2022-03-15 at d37f7359bf)
483
- + t6423-merge-rename-directories.sh: use the $(...) construct
484
-
485
- Code clean-up.
486
-
487
- Will merge to 'master'.
488
- source: <20220313172829.215517-1-gitter.spiros@gmail.com>
489
-
490
-
491
-* jc/rebase-detach-fix (2022-03-16) 2 commits
492
- - rebase: set REF_HEAD_DETACH in checkout_up_to_date()
493
- - rebase: use test_commit helper in setup
506
+* jc/rebase-detach-fix (2022-03-18) 2 commits
507
+ (merged to 'next' on 2022-03-21 at 1eb51c65c9)
508
+ + rebase: set REF_HEAD_DETACH in checkout_up_to_date()
509
+ + rebase: use test_commit helper in setup
510
511
"git rebase $base $non_branch_commit", when $base is an ancestor or
512
the $non_branch_commit, modified the current branch, which has been
513
corrected.
514
499
- Will merge to 'next'.
500
- source: <pull.1226.v3.git.git.1647487001.gitgitgadget@gmail.com>
501
-
502
-
503
-* jh/builtin-fsmonitor-part-2plus (2022-03-13) 16 commits
504
- - fsmonitor-settings: simplify initialization of settings data
505
- - fsmonitor--daemon: add _() to calls to error()
506
- - fsmonitor--daemon: add _() to calls to die()
507
- - compat/fsmonitor/fsm-listen-win32: add _() to calls to error()
508
- - compat/fsmonitor/fsm-listen-darwin: add _() to calls to error()
509
- - fsmonitor-ipc: add _() to calls to die()
510
- - t7527: delete unused verify_status() function
511
- - t7527: fix && chaining in matrix_try()
512
- - t7527: add parameters to start_daemon to handle args and subshell
513
- - t/perf/p7519: cleanup coding style
514
- - t/perf/p7519: use grep rather than egrep in test
515
- - fsmonitor--daemon: refactor cookie handling for readability
516
- - t/helper/fsmonitor-client: cleanup call to parse_options()
517
- - compat/fsmonitor/fsm-listen-darwin: split out GCC-specific declarations
518
- - update-index: convert advise() messages back to warning()
519
- - t/test-lib: avoid using git on LHS of pipe
520
- (this branch uses jh/builtin-fsmonitor-part2.)
521
-
522
- Various small fixes and cleanups on part-2 of the same topic.
523
-
524
- Needs review.
525
- source: <pull.1174.git.1647033303.gitgitgadget@gmail.com>
515
+ Will merge to 'master'.
516
+ source: <pull.1226.v5.git.git.1647611643.gitgitgadget@gmail.com>
517
518
519
* ps/fsync-refs (2022-03-15) 2 commits
529
- - core.fsync: new option to harden references
530
- - Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs
520
+ (merged to 'next' on 2022-03-17 at 9e007c1178)
521
+ + core.fsync: new option to harden references
522
+ + Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs
523
(this branch uses ns/core-fsyncmethod.)
524
525
Updates to refs traditionally weren't fsync'ed, but we can
526
configure using core.fsync variable to do so.
527
536
- Will merge to 'next'.
528
+ Will merge to 'master'.
529
source: <47dd79106b93bb81750320d50ccaa74c24aacd28.1646992380.git.ps@pks.im>
530
531
540
-* vd/stash-silence-reset (2022-03-14) 5 commits
541
- - stash: make internal resets quiet and refresh index
542
- - reset: suppress '--no-refresh' advice if logging is silenced
543
- - reset: replace '--quiet' with '--no-refresh' in performance advice
544
- - reset: introduce --[no-]refresh option to --mixed
545
- - reset: revise index refresh advice
532
+* vd/stash-silence-reset (2022-03-23) 8 commits
533
+ (merged to 'next' on 2022-03-23 at 932f4f6529)
534
+ + reset: remove 'reset.refresh' config option
535
+ + reset: remove 'reset.quiet' config option
536
+ + reset: do not make '--quiet' disable index refresh
537
+ (merged to 'next' on 2022-03-17 at c469159b61)
538
+ + stash: make internal resets quiet and refresh index
539
+ + reset: suppress '--no-refresh' advice if logging is silenced
540
+ + reset: replace '--quiet' with '--no-refresh' in performance advice
541
+ + reset: introduce --[no-]refresh option to --mixed
542
+ + reset: revise index refresh advice
543
544
"git stash" does not allow subcommands it internally runs as its
545
implementation detail, except for "git reset", to emit messages;
546
now "git reset" part has also been squelched.
547
551
- Will merge to 'next'?
548
+ Will merge to 'master'.
549
+ source: <pull.1184.v2.git.1648059480.gitgitgadget@gmail.com>
550
source: <pull.1170.v3.git.1647308982.gitgitgadget@gmail.com>
551
552
555
-* tl/ls-tree-oid-only (2022-03-04) 12 commits
553
+* tl/ls-tree-oid-only (2022-03-23) 15 commits
554
+ - ls-tree: split up "fast path" callbacks
555
+ - ls-tree: detect and error on --name-only --name-status
556
- ls-tree: support --object-only option for "git-ls-tree"
557
- ls-tree: introduce "--format" option
558
- cocci: allow padding with `strbuf_addf()`
@@ -565,51 +565,35 @@ Release tarballs are available at:
565
- ls-tree: use "enum object_type", not {blob,tree,commit}_type
566
- ls-tree: add missing braces to "else" arms
567
- ls-tree: remove commented-out code
568
+ - ls-tree tests: add tests for --name-status
569
570
"git ls-tree" learns "--oid-only" option, similar to "--name-only",
571
and more generalized "--format" option.
571
- source: <cover.1646390152.git.dyroneteng@gmail.com>
572
-
572
574
-* jd/userdiff-kotlin (2022-03-12) 1 commit
575
- (merged to 'next' on 2022-03-15 at 10fabd722a)
576
- + userdiff: add builtin diff driver for kotlin language.
577
-
578
- A new built-in userdiff driver for kotlin.
579
-
580
- Will merge to 'master'.
581
- source: <20220312044832.718356-1-jaydeepjd.8914@gmail.com>
582
-
583
-
584
-* ab/hook-tests-updates (2022-03-07) 10 commits
585
- - tests: change "cat && chmod +x" to use "test_hook"
586
- - tests: change "mkdir -p && write_script" to use "test_hook"
587
- - test-lib-functions: add and use a "test_hook" wrapper
588
- - fetch+push tests: have tests clean up their own mess
589
- - hook tests: get rid of unnecessary sub-shells
590
- - tests: indent and add hook setup to "test_expect_success"
591
- - bugreport tests: tighten up "git bugreport -s hooks" test
592
- - tests: assume the hooks are disabled by default
593
- - t5540: don't rely on "hook/post-update.sample"
594
- - hook tests: turn exit code assertions into a loop
573
+ Will merge to 'next'?
574
+ source: <cover.1648026472.git.dyroneteng@gmail.com>
575
+
576
+
577
+* ab/hook-tests-updates (2022-03-17) 13 commits
578
+ (merged to 'next' on 2022-03-23 at 8c35279100)
579
+ + http tests: use "test_hook" for "smart" and "dumb" http tests
580
+ + proc-receive hook tests: use "test_hook" instead of "write_script"
581
+ + tests: extend "test_hook" for "rm" and "chmod -x", convert "$HOOK"
582
+ + tests: use "test_hook" for misc "mkdir -p" and "chmod" cases
583
+ + tests: change "mkdir -p && write_script" to use "test_hook"
584
+ + tests: change "cat && chmod +x" to use "test_hook"
585
+ + gc + p4 tests: use "test_hook", remove sub-shells
586
+ + fetch+push tests: use "test_hook" and "test_when_finished" pattern
587
+ + bugreport tests: tighten up "git bugreport -s hooks" test
588
+ + tests: assume the hooks are disabled by default
589
+ + http tests: don't rely on "hook/post-update.sample"
590
+ + hook tests: turn exit code assertions into a loop
591
+ + test-lib-functions: add and use a "test_hook" wrapper
592
593
Update tests around the use of hook scripts.
594
598
- Needs a (hopefully) final eyeballing.
599
- source: <cover-v2-00.10-00000000000-20220307T123909Z-avarab@gmail.com>
600
-
601
-
602
-* ep/test-malloc-check-with-glibc-2.34 (2022-03-09) 2 commits
603
- (merged to 'next' on 2022-03-12 at 13ed9014e6)
604
- + test-lib: declare local variables as local
605
- (merged to 'next' on 2022-03-08 at 810ac5a1d3)
606
- + test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34
607
-
608
- The method to trigger malloc check used in our tests no longer work
609
- with newer versions of glibc.
610
-
595
Will merge to 'master'.
612
- source: <81f43fbefde84ab7af9ee2ac760845b728a48ab5.1646861976.git.git@grubix.eu>
596
+ source: <cover-v3-00.13-00000000000-20220317T100820Z-avarab@gmail.com>
597
598
599
* jc/mailsplit-warn-on-tty (2022-03-03) 1 commit
@@ -670,18 +654,6 @@ Release tarballs are available at:
654
source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
655
656
673
-* jk/name-rev-w-genno (2022-03-13) 1 commit
674
- (merged to 'next' on 2022-03-15 at b370601916)
675
- + name-rev: use generation numbers if available
676
-
677
- "git name-rev" learned to use the generation numbers when setting
678
- the lower bound of searching commits used to explain the revision,
679
- when available, instead of committer time.
680
-
681
- Will merge to 'master'.
682
- source: <20220312000015.3643427-1-jacob.e.keller@intel.com>
683
-
684
-
657
* et/xdiff-indirection (2022-02-17) 1 commit
658
- xdiff: provide indirection to git functions
659
@@ -693,19 +665,6 @@ Release tarballs are available at:
665
source: <20220217225408.GB7@edef91d97c94>
666
667
696
-* sm/no-git-in-upstream-of-pipe-in-tests (2022-03-12) 3 commits
697
- (merged to 'next' on 2022-03-12 at 9e6f538b36)
698
- + t0030-t0050: avoid pipes with Git on LHS
699
- + t0001-t0028: avoid pipes with Git on LHS
700
- (merged to 'next' on 2022-03-08 at 3ff4e5c09c)
701
- + t0003: avoid pipes with Git on LHS
702
-
703
- Test fixes.
704
-
705
- Will merge to 'master'.
706
- source: <20220223115347.3083-1-shivam828787@gmail.com>
707
-
708
-
668
* ab/http-gcc-12-workaround (2022-02-25) 1 commit
669
- http API: fix dangling pointer issue noted by GCC 12.0
670
@@ -713,41 +672,17 @@ Release tarballs are available at:
672
source: <patch-v2-1.1-777838267a5-20220225T090816Z-avarab@gmail.com>
673
674
716
-* ds/partial-bundles (2022-03-09) 13 commits
717
- (merged to 'next' on 2022-03-13 at 03529eaa59)
718
- + clone: fail gracefully when cloning filtered bundle
719
- + bundle: unbundle promisor packs
720
- + bundle: create filtered bundles
721
- + rev-list: move --filter parsing into revision.c
722
- + bundle: parse filter capability
723
- + list-objects: handle NULL function pointers
724
- + MyFirstObjectWalk: update recommended usage
725
- + list-objects: consolidate traverse_commit_list[_filtered]
726
- + pack-bitmap: drop filter in prepare_bitmap_walk()
727
- + pack-objects: use rev.filter when possible
728
- + revision: put object filter into struct rev_info
729
- + list-objects-filter-options: create copy helper
730
- + index-pack: document and test the --promisor option
731
- (this branch is used by ds/bundle-uri.)
732
-
733
- Bundle file format gets extended to allow a partial bundle,
734
- filtered by similar criteria you would give when making a
735
- partial/lazy clone.
736
-
737
- Will merge to 'master'.
738
- source: <pull.1159.v4.git.1646841703.gitgitgadget@gmail.com>
739
-
740
-
741
-* jd/prompt-upstream-mark (2022-03-03) 4 commits
742
- - git-prompt: put upstream comments together
743
- - git-prompt: make long upstream state indicator consistent
744
- - git-prompt: make upstream state indicator location consistent
745
- - git-prompt: rename `upstream` to `upstream_type`
675
+* jd/prompt-upstream-mark (2022-03-23) 4 commits
676
+ (merged to 'next' on 2022-03-23 at 518404a091)
677
+ + git-prompt: put upstream comments together
678
+ + git-prompt: make long upstream state indicator consistent
679
+ + git-prompt: make upstream state indicator location consistent
680
+ + git-prompt: rename `upstream` to `upstream_type`
681
682
Tweaks in the command line prompt (in contrib/) code around its
683
GIT_PS1_SHOWUPSTREAM feature.
684
750
- What's the status of this one?
685
+ Will merge to 'master'.
686
source: <pull.1162.v2.git.1645991832.gitgitgadget@gmail.com>
687
688
@@ -816,67 +751,53 @@ Release tarballs are available at:
751
source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
752
753
819
-* pw/single-key-interactive (2022-02-23) 4 commits
820
- (merged to 'next' on 2022-03-13 at 02fd6aca2f)
821
- + add -p: disable stdin buffering when interactive.singlekey is set
822
- + terminal: set VMIN and VTIME in non-canonical mode
823
- + terminal: pop signal handler when terminal is restored
824
- + terminal: always reset terminal when reading without echo
825
- (this branch is used by pw/add-p-single-key.)
826
-
827
- The single-key interactive operation used by "git add -p" has been
828
- made more robust.
829
-
830
- Will merge to 'master'.
831
- source: <pull.1146.v2.git.1645556015.gitgitgadget@gmail.com>
832
-
833
-
834
-* jh/builtin-fsmonitor-part3 (2022-03-09) 28 commits
835
- . fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
836
- . t7527: test Unicode NFC/NFD handling on MacOS
837
- . t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
838
- . fsmonitor: on macOS also emit NFC spelling for NFD pathname
839
- . t7527: test FSMonitor on case insensitive+preserving file system
840
- . fsmonitor: never set CE_FSMONITOR_VALID on submodules
841
- . t/perf/p7527: add perf test for builtin FSMonitor
842
- . t7527: FSMonitor tests for directory moves
843
- . fsmonitor: optimize processing of directory events
844
- . fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
845
- . fsm-health-win32: force shutdown daemon if worktree root moves
846
- . fsm-health-win32: add polling framework to monitor daemon health
847
- . fsmonitor--daemon: stub in health thread
848
- . fsmonitor--daemon: rename listener thread related variables
849
- . fsmonitor--daemon: prepare for adding health thread
850
- . fsmonitor--daemon: cd out of worktree root
851
- . fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
852
- . unpack-trees: initialize fsmonitor_has_run_once in o->result
853
- . fsmonitor-settings: remote repos on Windows are incompatible
854
- . fsmonitor-settings: remote repos on macOS are incompatible
855
- . fsmonitor-settings: stub in macOS-specific incompatibility checking
856
- . fsmonitor-settings: VFS for Git virtual repos are incompatible
857
- . fsmonitor-settings: stub in platform-specific incompatibility checking
858
- . fsmonitor-settings: bare repos are incompatible with FSMonitor
859
- . t/helper/fsmonitor-client: create stress test
860
- . t7527: test FSMonitor on repos with Unicode root paths
861
- . fsm-listen-win32: handle shortnames
862
- . Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
754
+* jh/builtin-fsmonitor-part3 (2022-03-23) 28 commits
755
+ - t7527: test Unicode NFC/NFD handling on MacOS
756
+ - t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
757
+ - fsmonitor: on macOS also emit NFC spelling for NFD pathname
758
+ - t7527: test FSMonitor on case insensitive+preserving file system
759
+ - fsmonitor: never set CE_FSMONITOR_VALID on submodules
760
+ - t/perf/p7527: add perf test for builtin FSMonitor
761
+ - t7527: FSMonitor tests for directory moves
762
+ - fsmonitor: optimize processing of directory events
763
+ - fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
764
+ - fsm-health-win32: force shutdown daemon if worktree root moves
765
+ - fsm-health-win32: add polling framework to monitor daemon health
766
+ - fsmonitor--daemon: stub in health thread
767
+ - fsmonitor--daemon: rename listener thread related variables
768
+ - fsmonitor--daemon: prepare for adding health thread
769
+ - fsmonitor--daemon: cd out of worktree root
770
+ - fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
771
+ - unpack-trees: initialize fsmonitor_has_run_once in o->result
772
+ - fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
773
+ - fsmonitor-settings: remote repos on Windows are incompatible
774
+ - fsmonitor-settings: remote repos on macOS are incompatible
775
+ - fsmonitor-settings: stub in macOS-specific incompatibility checking
776
+ - fsmonitor-settings: VFS for Git virtual repos are incompatible
777
+ - fsmonitor-settings: stub in Win32-specific incompatibility checking
778
+ - fsmonitor-settings: bare repos are incompatible with FSMonitor
779
+ - t/helper/fsmonitor-client: create stress test
780
+ - t7527: test FSMonitor on repos with Unicode root paths
781
+ - fsm-listen-win32: handle shortnames
782
+ - Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
783
(this branch uses jh/builtin-fsmonitor-part2.)
784
785
More fsmonitor--daemon.
866
- source: <pull.1143.v2.git.1646777727.gitgitgadget@gmail.com>
786
+ source: <pull.1143.v3.git.1647973380.gitgitgadget@gmail.com>
787
788
789
* gc/recursive-fetch-with-unused-submodules (2022-03-16) 10 commits
870
- - submodule: fix latent check_has_commit() bug
871
- - fetch: fetch unpopulated, changed submodules
872
- - submodule: move logic into fetch_task_create()
873
- - submodule: extract get_fetch_task()
874
- - submodule: store new submodule commits oid_array in a struct
875
- - submodule: inline submodule_commits() into caller
876
- - submodule: make static functions read submodules from commits
877
- - t5526: create superproject commits with test helper
878
- - t5526: stop asserting on stderr literally
879
- - t5526: introduce test helper to assert on fetches
790
+ (merged to 'next' on 2022-03-17 at 2813b7b1c3)
791
+ + submodule: fix latent check_has_commit() bug
792
+ + fetch: fetch unpopulated, changed submodules
793
+ + submodule: move logic into fetch_task_create()
794
+ + submodule: extract get_fetch_task()
795
+ + submodule: store new submodule commits oid_array in a struct
796
+ + submodule: inline submodule_commits() into caller
797
+ + submodule: make static functions read submodules from commits
798
+ + t5526: create superproject commits with test helper
799
+ + t5526: stop asserting on stderr literally
800
+ + t5526: introduce test helper to assert on fetches
801
802
When "git fetch --recurse-submodules" grabbed submodule commits
803
that would be needed to recursively check out newly fetched commits
@@ -884,7 +805,7 @@ Release tarballs are available at:
805
in the current checkout of the superproject. We now do so for all
806
submodules that have been run "git submodule init" on.
807
887
- Will merge to 'next'.
808
+ Will merge to 'master'.
809
source: <20220308001433.94995-1-chooglen@google.com>
810
811
@@ -926,29 +847,6 @@ Release tarballs are available at:
847
source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
848
849
929
-* gc/submodule-update-part1 (2022-03-04) 13 commits
930
- (merged to 'next' on 2022-03-15 at 92911dced9)
931
- + submodule--helper update-clone: check for --filter and --init
932
- + submodule update: add tests for --filter
933
- + submodule--helper: remove ensure-core-worktree
934
- + submodule--helper update-clone: learn --init
935
- + submodule--helper: allow setting superprefix for init_submodule()
936
- + submodule--helper: refactor get_submodule_displaypath()
937
- + submodule--helper run-update-procedure: learn --remote
938
- + submodule--helper: don't use bitfield indirection for parse_options()
939
- + submodule--helper: get remote names from any repository
940
- + submodule--helper run-update-procedure: remove --suboid
941
- + submodule--helper: reorganize code for sh to C conversion
942
- + submodule--helper: remove update-module-mode
943
- + submodule tests: test for init and update failure output
944
- (this branch is used by gc/submodule-update-part2.)
945
-
946
- Rewrite of "git submodule update" in C (early part).
947
-
948
- Will merge to 'master'.
949
- source: <20220305001401.20888-1-chooglen@google.com>
950
-
951
-
850
* en/merge-tree (2022-02-23) 13 commits
851
- git-merge-tree.txt: add a section on potentional usage mistakes
852
- merge-tree: add a --allow-unrelated-histories flag
@@ -1019,45 +917,43 @@ Release tarballs are available at:
917
source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
918
919
1022
-* jh/builtin-fsmonitor-part2 (2022-03-01) 30 commits
1023
- (merged to 'next' on 2022-03-08 at 5f9d385483)
1024
- + update-index: convert fsmonitor warnings to advise
1025
- + t7527: test status with untracked-cache and fsmonitor--daemon
1026
- + fsmonitor: force update index after large responses
1027
- + fsmonitor--daemon: use a cookie file to sync with file system
1028
- + fsmonitor--daemon: periodically truncate list of modified files
1029
- + t/perf/p7519: add fsmonitor--daemon test cases
1030
- + t/perf/p7519: speed up test on Windows
1031
- + t/helper/test-chmtime: skip directories on Windows
1032
- + t/perf: avoid copying builtin fsmonitor files into test repo
1033
- + t7527: create test for fsmonitor--daemon
1034
- + t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
1035
- + help: include fsmonitor--daemon feature flag in version info
1036
- + fsmonitor--daemon: implement handle_client callback
1037
- + compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
1038
- + compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent
1039
- + compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
1040
- + fsmonitor--daemon: create token-based changed path cache
1041
- + fsmonitor--daemon: define token-ids
1042
- + fsmonitor--daemon: add pathname classification
1043
- + fsmonitor--daemon: implement 'start' command
1044
- + fsmonitor--daemon: implement 'run' command
1045
- + compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
1046
- + compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
1047
- + fsmonitor--daemon: implement 'stop' and 'status' commands
1048
- + fsmonitor--daemon: add a built-in fsmonitor daemon
1049
- + fsmonitor: document builtin fsmonitor
1050
- + fsmonitor: use IPC to query the builtin FSMonitor daemon
1051
- + fsmonitor: config settings are repository-specific
1052
- + fsmonitor-ipc: create client routines for git-fsmonitor--daemon
1053
- + fsmonitor: enhance existing comments, clarify trivial response handling
1054
- (this branch is used by jh/builtin-fsmonitor-part-2plus and jh/builtin-fsmonitor-part3.)
920
+* jh/builtin-fsmonitor-part2 (2022-03-23) 29 commits
921
+ - t7527: test status with untracked-cache and fsmonitor--daemon
922
+ - fsmonitor: force update index after large responses
923
+ - fsmonitor--daemon: use a cookie file to sync with file system
924
+ - fsmonitor--daemon: periodically truncate list of modified files
925
+ - t/perf/p7519: add fsmonitor--daemon test cases
926
+ - t/perf/p7519: speed up test on Windows
927
+ - t/helper/test-chmtime: skip directories on Windows
928
+ - t/perf: avoid copying builtin fsmonitor files into test repo
929
+ - t7527: create test for fsmonitor--daemon
930
+ - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
931
+ - help: include fsmonitor--daemon feature flag in version info
932
+ - fsmonitor--daemon: implement handle_client callback
933
+ - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
934
+ - compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent
935
+ - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
936
+ - fsmonitor--daemon: create token-based changed path cache
937
+ - fsmonitor--daemon: define token-ids
938
+ - fsmonitor--daemon: add pathname classification
939
+ - fsmonitor--daemon: implement 'start' command
940
+ - fsmonitor--daemon: implement 'run' command
941
+ - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
942
+ - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
943
+ - fsmonitor--daemon: implement 'stop' and 'status' commands
944
+ - fsmonitor--daemon: add a built-in fsmonitor daemon
945
+ - fsmonitor: document builtin fsmonitor
946
+ - fsmonitor: use IPC to query the builtin FSMonitor daemon
947
+ - fsmonitor: config settings are repository-specific
948
+ - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
949
+ - fsmonitor: enhance existing comments, clarify trivial response handling
950
+ (this branch is used by jh/builtin-fsmonitor-part3.)
951
952
Built-in fsmonitor (part 2).
953
1058
- Discarded to be replaced.
1059
- cf. <33a9f751-6254-9b3e-6eb7-7844ac664e00@jeffhostetler.com>
1060
- source: <pull.1041.v6.git.1646160212.gitgitgadget@gmail.com>
954
+ Expecting a roroll that is hopefully the final one.
955
+ cf. <eb503dec-4a30-dd29-ac65-a8924fa178d6@jeffhostetler.com>
956
+ source: <pull.1041.v7.git.1647972010.gitgitgadget@gmail.com>
957
958
959
* es/superproject-aware-submodules (2022-03-09) 3 commits