4a693ca274 · matheusbsbs/matheus-bagliano

@@ -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, #07; Fri, 25)

3 +Subject: What's cooking in git.git (Feb 2022, #08; Mon, 28)

4 X-master-at: 715d08a9e51251ad8290b181b6ac3b9e1f9719d7

5 -X-next-at: 0bdcbb44647328cb1bdb23be648ecb677189c7b4

5 +X-next-at: 50a0bfa57956f3f2835aabb9a04449ba66e9469b

6

7 -What's cooking in git.git (Feb 2022, #07; Fri, 25)

7 +What's cooking in git.git (Feb 2022, #08; Mon, 28)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking in my tree. Commits

@@ -47,159 +47,98 @@ Release tarballs are available at:

47 https://www.kernel.org/pub/software/scm/git/

48

49 --------------------------------------------------

50 -[Graduated to 'master']

51 -

52 -* ab/ambiguous-object-name (2022-01-27) 7 commits

53 - (merged to 'next' on 2022-02-15 at 6028098cfe)

54 - + object-name: re-use "struct strbuf" in show_ambiguous_object()

55 - + object-name: iterate ambiguous objects before showing header

56 - + object-name: show date for ambiguous tag objects

57 - + object-name: make ambiguous object output translatable

58 - + object-name: explicitly handle bad tags in show_ambiguous_object()

59 - + object-name: explicitly handle OBJ_BAD in show_ambiguous_object()

60 - + object-name tests: add tests for ambiguous object blind spots

61 -

62 - Error output given in response to an ambiguous object name has been

63 - improved.

64 - source: <cover-v8-0.7-00000000000-20220127T052116Z-avarab@gmail.com>

65 -

66 -

67 -* ab/date-mode-release (2022-02-16) 5 commits

68 - (merged to 'next' on 2022-02-17 at 62f1cf68ae)

69 - + date API: add and use a date_mode_release()

70 - + date API: add basic API docs

71 - + date API: provide and use a DATE_MODE_INIT

72 - + date API: create a date.h, split from cache.h

73 - + cache.h: remove always unused show_date_human() declaration

74 -

75 - Plug (some) memory leaks around parse_date_format().

76 - source: <cover-v3-0.5-00000000000-20220216T081203Z-avarab@gmail.com>

77 -

78 -

79 -* ab/diff-free-more (2022-02-16) 2 commits

80 - (merged to 'next' on 2022-02-17 at be8ae78a2d)

81 - + diff.[ch]: have diff_free() free options->parseopts

82 - + diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)

83 -

84 - Leakfixes.

85 - source: <cover-0.2-00000000000-20220216T105250Z-avarab@gmail.com>

86 -

87 -

88 -* ab/grep-patterntype (2022-02-15) 10 commits

89 - (merged to 'next' on 2022-02-16 at 64222759a2)

90 - + grep: simplify config parsing and option parsing

91 - + grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"

92 - + grep.h: make "grep_opt.pattern_type_option" use its enum

93 - + grep API: call grep_config() after grep_init()

94 - + grep.c: don't pass along NULL callback value

95 - + built-ins: trust the "prefix" from run_builtin()

96 - + grep tests: add missing "grep.patternType" config tests

97 - + grep tests: create a helper function for "BRE" or "ERE"

98 - + log tests: check if grep_config() is called by "log"-like cmds

99 - + grep.h: remove unused "regex_t regexp" from grep_opt

100 -

101 - Some code clean-up in the "git grep" machinery.

102 - source: <cover-v11-00.10-00000000000-20220216T000006Z-avarab@gmail.com>

103 -

104 -

105 -* ab/only-single-progress-at-once (2022-02-03) 9 commits

106 - (merged to 'next' on 2022-02-15 at 97ac92e662)

107 - + pack-bitmap-write.c: don't return without stop_progress()

108 - + progress API: unify stop_progress{,_msg}(), fix trace2 bug

109 - + progress.c: refactor stop_progress{,_msg}() to use helpers

110 - + progress.c: use dereferenced "progress" variable, not "(*p_progress)"

111 - + progress.h: format and be consistent with progress.c naming

112 - + progress.c tests: test some invalid usage

113 - + progress.c tests: make start/stop commands on stdin

114 - + progress.c test helper: add missing braces

115 - + leak tests: fix a memory leak in "test-progress" helper

116 -

117 - Further tweaks on progress API.

118 - source: <cover-v9-0.9-00000000000-20220203T213350Z-avarab@gmail.com>

119 -

120 -

121 -* ds/core-untracked-cache-config (2022-02-17) 1 commit

122 - (merged to 'next' on 2022-02-18 at 0c426fdec1)

123 - + dir: force untracked cache with core.untrackedCache

124 -

125 - Setting core.untrackedCache to true failed to add the untracked

126 - cache extension to the index.

127 - source: <pull.1058.v2.git.1645131630140.gitgitgadget@gmail.com>

50 +[New Topics]

51

52 +* js/ci-github-workflow-markup (2022-02-25) 9 commits

53 + - ci: call `finalize_test_case_output` a little later

54 + - ci: use `--github-workflow-markup` in the GitHub workflow

55 + - ci: optionally mark up output in the GitHub workflow

56 + - test(junit): avoid line feeds in XML attributes

57 + - tests: refactor --write-junit-xml code

58 + - ci/run-build-and-tests: add some structure to the GitHub workflow output

59 + - ci: make it easier to find failed tests' logs in the GitHub workflow

60 + - ci/run-build-and-tests: take a more high-level view

61 + - ci: fix code style

62

130 -* ds/sparse-checkout-requires-per-worktree-config (2022-02-08) 6 commits

131 - (merged to 'next' on 2022-02-15 at f86bec6da9)

132 - + config: make git_configset_get_string_tmp() private

133 - + worktree: copy sparse-checkout patterns and config on add

134 - + sparse-checkout: set worktree-config correctly

135 - + config: add repo_config_set_worktree_gently()

136 - + worktree: create init_worktree_config()

137 - + Documentation: add extensions.worktreeConfig details

138 - (this branch is used by ds/worktree-docs.)

63 + Update the GitHub workflow support to make it quicker to get to the

64 + failing test.

65

140 - "git sparse-checkout" wants to work with per-worktree configuration,

141 - but did not work well in a worktree attached to a bare repository.

142 - source: <pull.1101.v6.git.1644269583.gitgitgadget@gmail.com>

66 + Will merge to 'next'?

67 + source: <pull.1117.git.1643050574.gitgitgadget@gmail.com>

68

69

145 -* en/ort-inner-merge-conflict-report (2022-02-17) 1 commit

146 - (merged to 'next' on 2022-02-18 at 367dd32e74)

147 - + merge-ort: make informational messages from recursive merges clearer

70 +* jc/merge-continue-doc (2022-02-28) 1 commit

71 + - merge: 'git merge --continue' is merely 'git commit'

72

149 - Messages "ort" merge backend prepares while dealing with conflicted

150 - paths were unnecessarily confusing since it did not differentiate

151 - inner merges and outer merges.

152 - source: <pull.1121.git.1645079923090.gitgitgadget@gmail.com>

73 + "git merge" documentation clarifies that "git commit" is sufficient

74 + to conclude an interrupted merge.

75 + source: <xmqq1qzmy55g.fsf@gitster.g>

76

77

155 -* ja/i18n-common-messages (2022-02-04) 4 commits

156 - (merged to 'next' on 2022-02-15 at 23d56641fc)

157 - + i18n: fix some misformated placeholders in command synopsis

158 - + i18n: remove from i18n strings that do not hold translatable parts

159 - + i18n: factorize "invalid value" messages

160 - + i18n: factorize more 'incompatible options' messages

78 +* jk/name-rev-w-genno (2022-02-28) 1 commit

79 + . name-rev: use generation numbers if available

80

162 - Unify more messages to help l10n.

163 - source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>

81 + "git name-rev" learned to use the generation numbers when setting

82 + the lower bound of searching commits used to explain the revision,

83 + when available, instead of committer time.

84

85 + Will merge to 'next'?

86 + source: <20220228215025.325904-2-jacob.e.keller@intel.com>

87

166 -* jc/name-rev-stdin (2022-02-15) 1 commit

167 - (merged to 'next' on 2022-02-16 at ee993590a4)

168 - + name-rev: replace --stdin with --annotate-stdin in synopsis

88 +--------------------------------------------------

89 +[Stalled]

90

170 - Finishing touches to an earlier "name-rev --annotate-stdin" series.

171 - source: <pull.1216.git.git.1644958327302.gitgitgadget@gmail.com>

91 +* tl/ls-tree-oid-only (2022-02-08) 13 commits

92 + - ls-tree.c: support --object-only option for "git-ls-tree"

93 + - ls-tree: introduce function "fast_path()"

94 + - ls-tree.c: introduce "--format" option

95 + - cocci: allow padding with `strbuf_addf()`

96 + - ls-tree: introduce struct "show_tree_data"

97 + - ls-tree: slightly refactor `show_tree()`

98 + - ls-tree: fix "--name-only" and "--long" combined use bug

99 + - ls-tree: simplify nesting if/else logic in "show_tree()"

100 + - ls-tree: rename "retval" to "recurse" in "show_tree()"

101 + - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"

102 + - ls-tree: use "enum object_type", not {blob,tree,commit}_type

103 + - ls-tree: add missing braces to "else" arms

104 + - ls-tree: remove commented-out code

105

106 + "git ls-tree" learns "--oid-only" option, similar to "--name-only",

107 + and more generalized "--format" option.

108 + source: <cover.1644319434.git.dyroneteng@gmail.com>

109

174 -* js/apply-partial-clone-filters-recursively (2022-02-09) 1 commit

175 - (merged to 'next' on 2022-02-16 at 4b3852bd52)

176 - + clone, submodule: pass partial clone filters to submodules

110

178 - "git clone --filter=... --recurse-submodules" only makes the

179 - top-level a partial clone, while submodules are fully cloned. This

180 - behaviour is changed to pass the same filter down to the submodules.

181 - source: <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@google.com>

111 +* je/http-better-error-output (2021-12-03) 1 commit

112 + . http-backend: give a hint that web browser access is not supported

113

114 + When the http-backend program, which is the server-side component

115 + for the smart HTTP transport, sends a "404 Not found" error, we

116 + deliberately did not say anything to the requesting client. We now

117 + send a message back to the browser to tell the user that they do

118 + not want to visit the URL via their browser, instead of a totally

119 + blank page.

120

184 -* rs/pcre-invalid-utf8-fix-fix (2022-02-17) 1 commit

185 - (merged to 'next' on 2022-02-18 at 9e47d58bda)

186 - + grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround

121 + Expecting a reroll.

122 + Breaks its self tests.

123 + cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>

124 + source: <20211202102855.23907-1-jengelh@inai.de>

125

188 - Workaround we have for versions of PCRE2 before their version 10.36

189 - were in effect only for their versions newer than 10.36 by mistake,

190 - which has been corrected.

191 - source: <4e391e2e-6561-3c2e-0306-c860a37356bc@web.de>

126

127 +* cb/save-term-across-editor-invocation (2021-12-01) 3 commits

128 + - fixup! editor: allow for saving/restoring terminal state

129 + - editor: allow for saving/restoring terminal state

130 + - terminal: teach save_term to fail when not foreground

131

194 -* tb/coc-plc-update (2022-02-18) 1 commit

195 - (merged to 'next' on 2022-02-23 at 9d45e42c9a)

196 - + CODE_OF_CONDUCT.md: update PLC members list

132 + Some editors are reported to leave the terminal in funny state

133 + after they exit on Windows. Work it around by saving and restoring

134 + the terminal state when needed.

135

198 - Document Taylor as a new member of Git PLC at SFC. Welcome.

199 - source: <f5daef58bc0bededd46bc9686c586ba5ae9a453c.1645211253.git.me@ttaylorr.com>

136 + Expecting a reroll.

137 + cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>

138 + source: <20211202035446.1154-1-carenas@gmail.com>

139

140 --------------------------------------------------

202 -[New Topics]

141 +[Cooking]

142

143 * et/xdiff-indirection (2022-02-17) 1 commit

144 - xdiff: provide indirection to git functions

@@ -213,15 +152,18 @@ Release tarballs are available at:

152

153

154 * jt/ls-files-stage-recurse (2022-02-23) 1 commit

216 - - ls-files: support --recurse-submodules --stage

155 + (merged to 'next' on 2022-02-28 at 4ad82bfdf6)

156 + + ls-files: support --recurse-submodules --stage

157

158 Many output modes of "ls-files" does not work with its

159 "--recurse-submodules" option, but the "-s" mode has taught to work

160 with it.

161 +

162 + Will merge to 'master'.

163 source: <20220224002303.2363189-1-jonathantanmy@google.com>

164

165

224 -* ab/c99 (2022-02-21) 2 commits

166 +* ab/c99-variadic-macros (2022-02-21) 2 commits

167 - C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code

168 - git-compat-util.h: clarify GCC v.s. C99-specific in comment

169

@@ -234,64 +176,69 @@ Release tarballs are available at:

176

177

178 * ab/hook-tests (2022-02-19) 2 commits

237 - - hook tests: use a modern style for "pre-push" tests

238 - - hook tests: test for exact "pre-push" hook input

179 + (merged to 'next' on 2022-02-28 at bb6b7d1c24)

180 + + hook tests: use a modern style for "pre-push" tests

181 + + hook tests: test for exact "pre-push" hook input

182

183 Test modernization.

184

242 - Will merge to 'next'.

185 + Will merge to 'master'.

186 source: <cover-0.2-00000000000-20220218T204719Z-avarab@gmail.com>

187

188

246 -* ab/test-lib-tweaks (2022-02-21) 4 commits

247 - - test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS

248 - - test-lib: make $GIT_BUILD_DIR an absolute path

249 - - test-lib: correct commentary on TEST_DIRECTORY overriding

250 - - test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS

189 +* ab/test-leak-diag (2022-02-28) 4 commits

190 + (merged to 'next' on 2022-02-28 at 3019aad7fe)

191 + + test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS

192 + + test-lib: make $GIT_BUILD_DIR an absolute path

193 + + test-lib: correct and assert TEST_DIRECTORY overriding

194 + + test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS

195

196 Random test-framework clean-up.

197

254 - Will merge to 'next'?

255 - source: <cover-v3-0.4-00000000000-20220221T155656Z-avarab@gmail.com>

198 + Will merge to 'master'.

199 + source: <cover-v4-0.4-00000000000-20220227T102256Z-avarab@gmail.com>

200

201

202 * ds/worktree-docs (2022-02-23) 11 commits

259 - - worktree: use 'worktree' over 'working tree'

260 - - worktree: use 'worktree' over 'working tree'

261 - - worktree: use 'worktree' over 'working tree'

262 - - worktree: use 'worktree' over 'working tree'

263 - - worktree: use 'worktree' over 'working tree'

264 - - worktree: use 'worktree' over 'working tree'

265 - - worktree: use 'worktree' over 'working tree'

266 - - worktree: extract checkout_worktree()

267 - - worktree: extract copy_sparse_checkout()

268 - - worktree: extract copy_filtered_worktree_config()

269 - - worktree: combine two translatable messages

203 + (merged to 'next' on 2022-02-28 at b7d23cb1a5)

204 + + worktree: use 'worktree' over 'working tree'

205 + + worktree: use 'worktree' over 'working tree'

206 + + worktree: use 'worktree' over 'working tree'

207 + + worktree: use 'worktree' over 'working tree'

208 + + worktree: use 'worktree' over 'working tree'

209 + + worktree: use 'worktree' over 'working tree'

210 + + worktree: use 'worktree' over 'working tree'

211 + + worktree: extract checkout_worktree()

212 + + worktree: extract copy_sparse_checkout()

213 + + worktree: extract copy_filtered_worktree_config()

214 + + worktree: combine two translatable messages

215

216 Tighten the language around "working tree" and "worktree" in the

217 docs.

218

274 - Will merge to 'next'.

219 + Will merge to 'master'.

220 source: <pull.1154.v3.git.1645626559.gitgitgadget@gmail.com>

221

222

223 * en/merge-ort-plug-leaks (2022-02-20) 2 commits

279 - - merge-ort: fix small memory leak in unique_path()

280 - - merge-ort: fix small memory leak in detect_and_process_renames()

224 + (merged to 'next' on 2022-02-28 at d7afb6b624)

225 + + merge-ort: fix small memory leak in unique_path()

226 + + merge-ort: fix small memory leak in detect_and_process_renames()

227

228 Leakfix.

229

284 - Will merge to 'next'.

230 + Will merge to 'master'.

231 source: <pull.1152.v2.git.1645320591.gitgitgadget@gmail.com>

232

233

288 -* jc/rerere-train-modernise (2022-02-20) 1 commit

289 - - rerere-train: modernise a bit

234 +* jc/rerere-train-modernise (2022-02-27) 1 commit

235 + (merged to 'next' on 2022-02-28 at d86d29733d)

236 + + rerere-train: two fixes to the use of "git show -s"

237

291 - Small modernisation of the rerere-train script (in contrib/).

238 + Small modernization of the rerere-train script (in contrib/).

239

293 - Will merge to 'next'.

294 - source: <xmqqsfsjuw8m.fsf@gitster.g>

240 + Will merge to 'master'.

241 + source: <20220227220924.2144325-1-gitster@pobox.com>

242

243

244 * ab/help-fixes (2022-02-23) 9 commits

@@ -307,28 +254,29 @@ Release tarballs are available at:

254

255 Updates to how command line options to "git help" are handled.

256

310 - Will merge to 'next'?

257 + Will merge to 'next'.

258 source: <cover-v2-0.9-00000000000-20220221T193708Z-avarab@gmail.com>

259

260

314 -* ac/usage-string-fixups (2022-02-23) 2 commits

315 - - parse-options.c: add style checks for usage-strings

316 - - amend remaining usage strings according to style guide

261 +* ac/usage-string-fixups (2022-02-23) 1 commit

262 + (merged to 'next' on 2022-02-28 at 5e8fa3f846)

263 + + amend remaining usage strings according to style guide

264

318 - Usage-string normalization, plus runtime enforcement.

265 + Usage-string normalization.

266

320 - Will merge to 'next'?

321 - source: <pull.1147.v3.git.1645626455.gitgitgadget@gmail.com>

267 + Will merge to 'master'.

268 + source: <f425e36b7ea4a310a8ad93d47ead4c1713117388.1645626455.git.gitgitgadget@gmail.com>

269

270

271 * mc/index-pack-report-max-size (2022-02-23) 1 commit

325 - - index-pack: clarify the breached limit

272 + (merged to 'next' on 2022-02-28 at 31b907844b)

273 + + index-pack: clarify the breached limit

274

275 When "index-pack" dies due to incoming data exceeding the maximum

276 allowed input size, include the value of the limit in the error

277 message.

278

331 - Will merge to 'next'?

279 + Will merge to 'master'.

280 source: <pull.1158.v2.git.1645661240356.gitgitgadget@gmail.com>

281

282

@@ -342,20 +290,21 @@ Release tarballs are available at:

290

291

292 * ab/c99-designated-initializers (2022-02-24) 9 commits

345 - - fast-import.c: use designated initializers for "partial" struct assignments

346 - - refspec.c: use designated initializers for "struct refspec_item"

347 - - convert.c: use designated initializers for "struct stream_filter*"

348 - - userdiff.c: use designated initializers for "struct userdiff_driver"

349 - - archive-*.c: use designated initializers for "struct archiver"

350 - - object-file: use designated initializers for "struct git_hash_algo"

351 - - trace2: use designated initializers for "struct tr2_dst"

352 - - trace2: use designated initializers for "struct tr2_tgt"

353 - - imap-send.c: use designated initializers for "struct imap_server_conf"

293 + (merged to 'next' on 2022-02-28 at 5ff6d5b26f)

294 + + fast-import.c: use designated initializers for "partial" struct assignments

295 + + refspec.c: use designated initializers for "struct refspec_item"

296 + + convert.c: use designated initializers for "struct stream_filter*"

297 + + userdiff.c: use designated initializers for "struct userdiff_driver"

298 + + archive-*.c: use designated initializers for "struct archiver"

299 + + object-file: use designated initializers for "struct git_hash_algo"

300 + + trace2: use designated initializers for "struct tr2_dst"

301 + + trace2: use designated initializers for "struct tr2_tgt"

302 + + imap-send.c: use designated initializers for "struct imap_server_conf"

303

304 Use designated initializers we started using in mid 2017 in more

305 parts of the codebase that are relatively quiescent.

306

358 - Will merge to 'next' and then to 'master'.

307 + Will merge to 'master'.

308 source: <cover-00.12-00000000000-20220224T092805Z-avarab@gmail.com>

309

310

@@ -385,31 +334,28 @@ Release tarballs are available at:

334 source: <cover-v3-0.9-00000000000-20220225T090127Z-avarab@gmail.com>

335

336

388 -* ah/advice-switch-requires-detach-to-detach (2022-02-24) 1 commit

389 - - switch: mention the --detach option when dying due to lack of a branch

337 +* ah/advice-switch-requires-detach-to-detach (2022-02-25) 1 commit

338 + (merged to 'next' on 2022-02-28 at 941ee621cf)

339 + + switch: mention the --detach option when dying due to lack of a branch

340

341 The error message given by "git switch HEAD~4" has been clarified

342 to suggest the "--detach" option that is required.

343

394 - Will merge to 'next'?

395 - source: <20220224064710.2252637-1-alexhenrie24@gmail.com>

344 + Will merge to 'master'.

345 + source: <20220226061213.1590341-1-alexhenrie24@gmail.com>

346

347

398 -* ds/commit-graph-gen-v2-fixes (2022-02-24) 7 commits

399 - - commit-graph: write file format v2

400 - - commit-graph: parse file format v2

401 - - commit-graph: document file format v2

348 +* ds/commit-graph-gen-v2-fixes (2022-02-28) 4 commits

349 - commit-graph: fix generation number v2 overflow values

350 - commit-graph: start parsing generation v2 (again)

351 - commit-graph: fix ordering bug in generation numbers

352 - test-read-graph: include extra post-parse info

353

354 Fixes to the way generation number v2 in the commit-graph files are

408 - (not) handled, and introduce a newer file format to store the same

409 - information in a way that is more efficient to access.

355 + (not) handled.

356

411 - Expecting a reroll.

412 - source: <pull.1163.git.1645735117.gitgitgadget@gmail.com>

357 + Will merge to 'next'.

358 + source: <pull.1163.v2.git.1646056423.gitgitgadget@gmail.com>

359

360

361 * ds/partial-bundles (2022-02-24) 11 commits

@@ -442,18 +388,20 @@ Release tarballs are available at:

388 added more processes our tests need to kill when cleaning up.

389 Adjustments have been made to accomodate these changes.

390

445 - Will merge to 'next'.

391 + Expecting a reroll.

392 + cf. <Yh0NHkyquB7nht3W@pobox.com>

393 source: <20220203123724.47529-1-fs@gigacodes.de>

394

395

396 * gc/stash-on-branch-with-multi-level-name (2022-02-24) 1 commit

450 - - stash: strip "refs/heads/" with skip_prefix

397 + (merged to 'next' on 2022-02-28 at 1a94306611)

398 + + stash: strip "refs/heads/" with skip_prefix

399

400 "git checkout -b branch/with/multi/level/name && git stash" only

401 recorded the last level component of the branch name, which has

402 been corrected.

403

456 - Will merge to 'next'.

404 + Will merge to 'master'.

405 source: <20220124205342.41450-1-chooglen@google.com>

406

407

@@ -477,7 +425,8 @@ Release tarballs are available at:

425 reasons with unsafe bytes correctly, which is worked around by

426 introducing NUL terminated output format with "-z".

427

480 - Iffy.

428 + Expecting a reroll.

429 + cf. <dd16416d-15c4-7f80-aaf6-a36d101e8928@gmail.com>

430 source: <pull.1164.git.1645801727732.gitgitgadget@gmail.com>

431

432

@@ -494,13 +443,10 @@ Release tarballs are available at:

443 "git fetch --repair" learned to fetch everything without telling

444 the other side what we already have, which is useful when you

445 cannot trust what you have in the local object store.

497 -

498 - Iffy. It may be cleaner to make a fresh clone and salvage bits

499 - out of the suspicious repository being "repair"ed.

446 source: <pull.1138.v2.git.1645719218.gitgitgadget@gmail.com>

447

448

503 -* tk/empty-untracked-cache (2022-02-25) 3 commits

449 +* tk/empty-untracked-cache (2022-02-28) 3 commits

450 - untracked-cache: write index when populating empty untracked cache

451 - t7519: populate untracked cache before test

452 - t7519: avoid file to index mtime race for untracked cache

@@ -510,7 +456,7 @@ Release tarballs are available at:

456 which has been corrected.

457

458 Will merge to 'next'.

513 - source: <pull.986.v2.git.1645809015.gitgitgadget@gmail.com>

459 + source: <pull.986.v3.git.1645999021.gitgitgadget@gmail.com>

460

461

462 * tk/simple-autosetupmerge (2022-02-25) 2 commits

@@ -529,11 +475,11 @@ Release tarballs are available at:

475 * tk/untracked-cache-with-uall (2022-02-25) 1 commit

476 - untracked-cache: support '--untracked-files=all' if configured

477

532 - The untracked cache system does not work well when the setting of

533 - status.showuntrackedfiles is 'normal' and not 'all', which has been

534 - updated.

478 + The performance of the "untracked cache" feature has been improved

479 + when "--untracked-files=<mode>" and "status.showUntrackedFiles"

480 + are combined.

481

536 - Needs review.

482 + Expecting a reroll.

483 source: <pull.985.v2.git.1645811564461.gitgitgadget@gmail.com>

484

485

@@ -552,51 +498,18 @@ Release tarballs are available at:

498 Needs review.

499 source: <pull.1157.v2.git.1645742073.gitgitgadget@gmail.com>

500

555 ---------------------------------------------------

556 -[Stalled]

557 -

558 -* je/http-better-error-output (2021-12-03) 1 commit

559 - . http-backend: give a hint that web browser access is not supported

560 -

561 - When the http-backend program, which is the server-side component

562 - for the smart HTTP transport, sends a "404 Not found" error, we

563 - deliberately did not say anything to the requesting client. We now

564 - send a message back to the browser to tell the user that they do

565 - not want to visit the URL via their browser, instead of a totally

566 - blank page.

567 -

568 - Expecting a reroll.

569 - Breaks its self tests.

570 - cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>

571 - source: <20211202102855.23907-1-jengelh@inai.de>

572 -

573 -

574 -* cb/save-term-across-editor-invocation (2021-12-01) 3 commits

575 - - fixup! editor: allow for saving/restoring terminal state

576 - - editor: allow for saving/restoring terminal state

577 - - terminal: teach save_term to fail when not foreground

578 -

579 - Some editors are reported to leave the terminal in funny state

580 - after they exit on Windows. Work it around by saving and restoring

581 - the terminal state when needed.

582 -

583 - Expecting a reroll.

584 - cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>

585 - source: <20211202035446.1154-1-carenas@gmail.com>

586 -

587 ---------------------------------------------------

588 -[Cooking]

501

502 * en/sparse-checkout-fixes (2022-02-20) 5 commits

591 - - sparse-checkout: reject arguments in cone-mode that look like patterns

592 - - sparse-checkout: error or warn when given individual files

593 - - sparse-checkout: pay attention to prefix for {set, add}

594 - - sparse-checkout: correctly set non-cone mode when expected

595 - - sparse-checkout: correct reapply's handling of options

503 + (merged to 'next' on 2022-02-28 at 7307431c62)

504 + + sparse-checkout: reject arguments in cone-mode that look like patterns

505 + + sparse-checkout: error or warn when given individual files

506 + + sparse-checkout: pay attention to prefix for {set, add}

507 + + sparse-checkout: correctly set non-cone mode when expected

508 + + sparse-checkout: correct reapply's handling of options

509

510 Further polishing of "git sparse-checkout".

511

599 - Will merge to 'next'.

512 + Will merge to 'master'.

513 source: <pull.1118.v5.git.1645289086.gitgitgadget@gmail.com>

514

515

@@ -699,10 +612,13 @@ Release tarballs are available at:

612

613 Improve failure case behaviour of xdiff library when memory

614 allocation fails.

615 +

616 + Will merge to 'next'.

617 source: <pull.1140.v2.git.1645006510.gitgitgadget@gmail.com>

618

619

705 -* gc/recursive-fetch-with-unused-submodules (2022-02-24) 11 commits

620 +* gc/recursive-fetch-with-unused-submodules (2022-02-28) 12 commits

621 + - SQUASH???

622 - SQUASH???

623 - submodule: fix latent check_has_commit() bug

624 - fetch: fetch unpopulated, changed submodules

@@ -769,7 +685,8 @@ Release tarballs are available at:

685

686 Implementation of "scalar diagnose" subcommand.

687

772 - What's the state of this thing?

688 + Expecting a reroll.

689 + cf. What is the status of this thing?

690 source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>

691

692

@@ -783,37 +700,28 @@ Release tarballs are available at:

700 flexible interface than the existing "--batch" or "--batch-check"

701 modes, to allow different kinds of inquiries made.

702

786 - Will merge to 'next'?

703 + Will merge to 'next'.

704 source: <pull.1212.v10.git.git.1645208594.gitgitgadget@gmail.com>

705

706

790 -* ar/submodule-update (2022-02-10) 20 commits

791 - . fixup! submodule: move core cmd_update() logic to C

792 - . fixup! submodule--helper run-update-procedure: learn --remote

793 - . fixup! submodule--helper run-update-procedure: remove --suboid

794 - . submodule: move core cmd_update() logic to C

795 - . submodule--helper: reduce logic in run_update_procedure()

796 - . submodule--helper: move functions around

797 - . submodule--helper update-clone: learn --init

798 - . submodule--helper: remove ensure-core-worktree

799 - . submodule--helper run-update-procedure: learn --remote

800 - . submodule--helper run-update-procedure: remove --suboid

801 - . submodule--helper: reorganize code for sh to C conversion

802 - . submodule--helper: remove update-module-mode

803 - . submodule tests: test for init and update failure output

804 - . submodule--helper: don't use bitfield indirection for parse_options()

805 - . builtin/submodule--helper.c: rename option variables to "opt"

806 - . builtin/submodule--helper.c: reformat designated initializers

807 - . submodule--helper: run update using child process struct

808 - . submodule--helper: allow setting superprefix for init_submodule()

809 - . submodule--helper: refactor get_submodule_displaypath()

810 - . submodule--helper: get remote names from any repository

811 -

812 - Rewrite of "git submodule update" in C.

813 -

814 - Does not seem to play well with other topics in flight, with heavy conflicts.

815 - cf. <xmqqv8xj71mt.fsf@gitster.g>

816 - source: <20220210092833.55360-1-chooglen@google.com>

707 +* ar/submodule-update (2022-02-28) 13 commits

708 + - submodule--helper update-clone: check for --filter and --init

709 + - submodule update: add tests for --filter

710 + - submodule--helper update-clone: learn --init

711 + - submodule--helper: allow setting superprefix for init_submodule()

712 + - submodule--helper: refactor get_submodule_displaypath()

713 + - submodule--helper run-update-procedure: learn --remote

714 + - submodule--helper: don't use bitfield indirection for parse_options()

715 + - submodule--helper: get remote names from any repository

716 + - submodule--helper: remove ensure-core-worktree

717 + - submodule--helper run-update-procedure: remove --suboid

718 + - submodule--helper: reorganize code for sh to C conversion

719 + - submodule--helper: remove update-module-mode

720 + - submodule tests: test for init and update failure output

721 +

722 + Rewrite of "git submodule update" in C (early part).

723 +

724 + source: <20220301044132.39474-1-chooglen@google.com>

725

726

727 * rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit

@@ -902,17 +810,18 @@ Release tarballs are available at:

810

811

812 * rs/bisect-executable-not-found (2022-01-19) 4 commits

905 - - bisect--helper: double-check run command on exit code 126 and 127

906 - - bisect: document run behavior with exit codes 126 and 127

907 - - bisect--helper: release strbuf and strvec on run error

908 - - bisect--helper: report actual bisect_state() argument on error

813 + (merged to 'next' on 2022-02-28 at c74bff7954)

814 + + bisect--helper: double-check run command on exit code 126 and 127

815 + + bisect: document run behavior with exit codes 126 and 127

816 + + bisect--helper: release strbuf and strvec on run error

817 + + bisect--helper: report actual bisect_state() argument on error

818

819 A not-so-common mistake is to write a script to feed "git bisect

820 run" without making it executable, in which case all tests will

821 exit with 126 or 127 error codes, even on revisions that are marked

913 - as good. Try to recoginse this situation and stop iteration early.

822 + as good. Try to recognize this situation and stop iteration early.

823

915 - Will merge to 'next'?

824 + Will merge to 'master'.

825 source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>

826

827

@@ -952,28 +861,6 @@ Release tarballs are available at:

861 source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>

862

863

955 -* tl/ls-tree-oid-only (2022-02-08) 13 commits

956 - - ls-tree.c: support --object-only option for "git-ls-tree"

957 - - ls-tree: introduce function "fast_path()"

958 - - ls-tree.c: introduce "--format" option

959 - - cocci: allow padding with `strbuf_addf()`

960 - - ls-tree: introduce struct "show_tree_data"

961 - - ls-tree: slightly refactor `show_tree()`

962 - - ls-tree: fix "--name-only" and "--long" combined use bug

963 - - ls-tree: simplify nesting if/else logic in "show_tree()"

964 - - ls-tree: rename "retval" to "recurse" in "show_tree()"

965 - - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"

966 - - ls-tree: use "enum object_type", not {blob,tree,commit}_type

967 - - ls-tree: add missing braces to "else" arms

968 - - ls-tree: remove commented-out code

969 -

970 - "git ls-tree" learns "--oid-only" option, similar to "--name-only",

971 - and more generalized "--format" option.

972 -

973 - What's the status of this thing?

974 - source: <cover.1644319434.git.dyroneteng@gmail.com>

975 -

976 -

864 * jh/builtin-fsmonitor-part2 (2022-02-11) 30 commits

865 - update-index: convert fsmonitor warnings to advise

866 - t7527: test status with untracked-cache and fsmonitor--daemon

@@ -1014,14 +901,12 @@ Release tarballs are available at:

901 source: <pull.1041.v5.git.1644612979.gitgitgadget@gmail.com>

902

903

1017 -* es/superproject-aware-submodules (2022-02-03) 4 commits

1018 - - submodule: record superproject gitdir during 'update'

1019 - - submodule: record superproject gitdir during absorbgitdirs

1020 - - introduce submodule.superprojectGitDir record

904 +* es/superproject-aware-submodules (2022-02-28) 3 commits

905 + - rev-parse: short-circuit superproject worktree when config unset

906 + - introduce submodule.hasSuperproject record

907 - t7400-submodule-basic: modernize inspect() helper

908

1023 - A configuration variable in a submodule points at the location of

1024 - the superproject it is bound to (RFC).

909 + A configuration variable in a repository tells if it is (or is not)

910 + a submodule of a superproject.

911

1026 - What is the status of this thing?

1027 - source: <20220203215914.683922-1-emilyshaffer@google.com>

912 + source: <20220301002613.1459916-1-emilyshaffer@google.com>

What's cooking (2022/02 #08)