6bb20c6663 · 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 (Mar 2022, #05; Wed, 23)

4 -X-master-at: a68dfadae5e95c7f255cf38c9efdcbc2e36d1931

5 -X-next-at: c54b8eb302ffb72f31e73a26044c8a864e2cb307

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

4 +X-master-at: abf474a5dd901f28013c52155411a48fd4c09922

5 +X-next-at: 24ac8fe03f00dc3a586a4d4fd3aca8f40dec48f0

6

7 -What's cooking in git.git (Mar 2022, #05; Wed, 23)

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

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

9

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

@@ -49,217 +49,208 @@ Release tarballs are available at:

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

50 [Graduated to 'master']

51

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 -

57 - Double-free fix for a recently merged topic.

58 - source: <cover-v2-0.2-00000000000-20220317T144838Z-avarab@gmail.com>

59 -

60 -

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 -

68 -

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 -

77 -

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 -

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 -

87 -

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 -

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

98 - (merged to 'next' on 2022-03-17 at eb26e034a3)

99 - + maintenance: fix synopsis in documentation

100 -

101 - Doc update.

102 - source: <pull.1178.git.1647366104967.gitgitgadget@gmail.com>

103 -

52 +* gc/recursive-fetch-with-unused-submodules (2022-03-16) 10 commits

53 + (merged to 'next' on 2022-03-17 at 2813b7b1c3)

54 + + submodule: fix latent check_has_commit() bug

55 + + fetch: fetch unpopulated, changed submodules

56 + + submodule: move logic into fetch_task_create()

57 + + submodule: extract get_fetch_task()

58 + + submodule: store new submodule commits oid_array in a struct

59 + + submodule: inline submodule_commits() into caller

60 + + submodule: make static functions read submodules from commits

61 + + t5526: create superproject commits with test helper

62 + + t5526: stop asserting on stderr literally

63 + + t5526: introduce test helper to assert on fetches

64

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.)

65 + When "git fetch --recurse-submodules" grabbed submodule commits

66 + that would be needed to recursively check out newly fetched commits

67 + in the superproject, it only paid attention to submodules that are

68 + in the current checkout of the superproject. We now do so for all

69 + submodules that have been run "git submodule init" on.

70 + source: <20220308001433.94995-1-chooglen@google.com>

71

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>

72

73 +* ns/core-fsyncmethod (2022-03-15) 6 commits

74 + (merged to 'next' on 2022-03-17 at c8a52f8cbe)

75 + + core.fsync: documentation and user-friendly aggregate options

76 + + core.fsync: new option to harden the index

77 + + core.fsync: add configuration parsing

78 + + core.fsync: introduce granular fsync control infrastructure

79 + + core.fsyncmethod: add writeout-only mode

80 + + wrapper: make inclusion of Windows csprng header tightly scoped

81 + (this branch is used by ns/batch-fsync and ps/fsync-refs.)

82

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

83 + Replace core.fsyncObjectFiles with two new configuration variables,

84 + core.fsync and core.fsyncMethod.

85 + source: <pull.1093.v6.git.1646952204.gitgitgadget@gmail.com>

86

137 - Code clean-up.

138 - source: <20220313195536.224075-1-gitter.spiros@gmail.com>

87

88 +* ps/fsync-refs (2022-03-15) 2 commits

89 + (merged to 'next' on 2022-03-17 at 9e007c1178)

90 + + core.fsync: new option to harden references

91 + + Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs

92 + (this branch uses ns/core-fsyncmethod.)

93

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

94 + Updates to refs traditionally weren't fsync'ed, but we can

95 + configure using core.fsync variable to do so.

96 + source: <47dd79106b93bb81750320d50ccaa74c24aacd28.1646992380.git.ps@pks.im>

97

145 - Code clean-up.

146 - source: <20220313172829.215517-1-gitter.spiros@gmail.com>

98 +--------------------------------------------------

99 +[New Topics]

100

101 +* ab/plug-leak-in-revisions (2022-03-25) 27 commits

102 + - revisions API: add a TODO for diff_free(&revs->diffopt)

103 + - revisions API: have release_revisions() release "topo_walk_info"

104 + - revisions API: have release_revisions() release "date_mode"

105 + - revisions API: call diff_free(&revs->pruning) in revisions_release()

106 + - revisions API: release "reflog_info" in release revisions()

107 + - revisions API: clear "boundary_commits" in release_revisions()

108 + - revisions API: have release_revisions() release "prune_data"

109 + - revisions API: have release_revisions() release "grep_filter"

110 + - revisions API: have release_revisions() release "filter"

111 + - revisions API: have release_revisions() release "cmdline"

112 + - revisions API: have release_revisions() release "mailmap"

113 + - revisions API: have release_revisions() release "commits"

114 + - revisions API users: use release_revisions() for "prune_data" users

115 + - revisions API users: use release_revisions() with UNLEAK()

116 + - revisions API users: use release_revisions() in builtin/log.c

117 + - revisions API users: use release_revisions() in http-push.c

118 + - revisions API users: add "goto cleanup" for release_revisions()

119 + - stash: always have the owner of "stash_info" free it

120 + - revisions API users: use release_revisions() in submodule.c edge case

121 + - revisions API users: add "goto cleanup" for "rev_info" early exit

122 + - revisions API users: add straightforward release_revisions()

123 + - revision.[ch]: provide and start using a release_revisions()

124 + - revision.[ch]: split freeing of revs->commit into a function

125 + - format-patch: don't leak "extra_headers" or "ref_message_ids"

126 + - string_list API users: use string_list_init_{no,}dup

127 + - blame: use "goto cleanup" for cleanup_scoreboard()

128 + - t/helper/test-fast-rebase.c: don't leak "struct strbuf"

129 +

130 + Plug the memory leaks from the trickiest API of all, the revision

131 + walker.

132

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

133 + Needs review.

134 + source: <cover-v3-00.27-00000000000-20220325T171340Z-avarab@gmail.com>

135

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>

136

137 +* ab/test-tap-fix-for-immediate (2022-03-24) 1 commit

138 + (merged to 'next' on 2022-03-25 at 1b83c01d99)

139 + + test-lib: have --immediate emit valid TAP on failure

140

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.)

141 + Fix test framework a bit.

142

177 - Rewrite of "git submodule update" in C (early part).

178 - source: <20220305001401.20888-1-chooglen@google.com>

143 + Will merge to 'master'.

144 + source: <patch-1.1-47b236139e6-20220323T204410Z-avarab@gmail.com>

145

146

181 -* jc/cat-file-batch-default-format-optim (2022-03-15) 1 commit

182 - (merged to 'next' on 2022-03-17 at 2d7f0efefa)

183 - + cat-file: skip expanding default format

147 +* ds/t7700-kept-pack-test (2022-03-25) 2 commits

148 + - test-lib-functions: remove test_subcommand_inexact

149 + - t7700: check post-condition in kept-pack test

150

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".

188 - source: <pull.1221.v4.git.git.1647312036664.gitgitgadget@gmail.com>

151 + Test clean-up.

152

153 + Will merge to 'next'.

154 + source: <pull.1185.v3.git.1648234967.gitgitgadget@gmail.com>

155

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.

156

195 - A new built-in userdiff driver for kotlin.

196 - source: <20220312044832.718356-1-jaydeepjd.8914@gmail.com>

157 +* ab/ci-github-workflow-markup (2022-03-27) 7 commits

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

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

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

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

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

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

164 + - Merge branch 'ab/ci-setup-simplify' into ab/ci-github-workflow-markup

165 + (this branch uses ab/ci-setup-simplify.)

166

167 + Build a moral equivalent of js/ci-github-workflow-markup on top of

168 + ab/ci-setup-simplify.

169

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

170 + Waiting for discussion to settle.

171 + source: <RFC-cover-v3-0.6-00000000000-20220325T183946Z-avarab@gmail.com>

172 +

173 +

174 +* ab/ci-setup-simplify (2022-03-27) 25 commits

175 + - CI: don't use "set -x" in "ci/lib.sh" output

176 + - CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case

177 + - CI: set CC in MAKEFLAGS directly, don't add it to the environment

178 + - CI: add more variables to MAKEFLAGS, except under vs-build

179 + - CI: narrow down variable definitions in --build and --test

180 + - CI: only invoke ci/lib.sh as "steps" in main.yml

181 + - CI: pre-select test slice in Windows & VS tests

182 + - ci/run-test-slice.sh: replace shelling out with "echo"

183 + - CI: move "env" definitions into ci/lib.sh

184 + - CI: combine ci/install{,-docker}-dependencies.sh

185 + - CI: split up and reduce "ci/test-documentation.sh"

186 + - CI: invoke "make artifacts-tar" directly in windows-build

187 + - CI: check ignored unignored build artifacts in "win[+VS] build" too

188 + - CI: remove "run-build-and-tests.sh", run "make [test]" directly

189 + - CI: export variables via a wrapper

190 + - CI: consistently use "export" in ci/lib.sh

191 + - CI: move p4 and git-lfs variables to ci/install-dependencies.sh

192 + - CI: have "static-analysis" run "check-builtins", not "documentation"

193 + - CI: have "static-analysis" run a "make ci-static-analysis" target

194 + - CI: don't have "git grep" invoke a pager in tree content check

195 + - CI: remove unused Azure ci/* code

196 + - CI: remove dead "tree skipping" code

197 + - CI: remove more dead Travis CI support

198 + - CI: make "$jobname" explicit, remove fallback

199 + - CI: run "set -ex" early in ci/lib.sh

200 + (this branch is used by ab/ci-github-workflow-markup.)

201 +

202 + Drive more actions done in CI via the Makefile instead of shell

203 + commands sprinkled in .github/workflows/main.yml

204

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>

205 + Waiting for discussion to settle.

206 + source: <cover-v2-00.25-00000000000-20220325T182534Z-avarab@gmail.com>

207

208

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

209 +* dl/prompt-pick-fix (2022-03-25) 1 commit

210 + - git-prompt: fix sequencer/todo detection

211

213 - Code clean-up.

214 - source: <pull.1177.v3.git.1647429623830.gitgitgadget@gmail.com>

212 + Fix shell prompt script (in contrib/) for those who set

213 + rebase.abbreviateCommands; we failed to recognize that we were in a

214 + multi-step cherry-pick session.

215

216 + Will merge to 'next'?

217 + cf. <xmqqwngdzque.fsf@gitster.g>

218 + source: <20220325145301.3370-1-danny0838@gmail.com>

219

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

220

222 - Remove unneeded <meta http-equiv=content-type...> from gitweb

223 - output.

224 - source: <20220308155612.105957-3-jason@jasonyundt.email>

221 +* tk/ambiguous-fetch-refspec (2022-03-28) 1 commit

222 + - tracking branches: add advice to ambiguous refspec error

223

224 + Give hint when branch tracking cannot be established because fetch

225 + refspecs from multiple remote repositories overlap.

226

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

227 + Will merge to 'next'?

228 + source: <pull.1183.v3.git.1648450268285.gitgitgadget@gmail.com>

229

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>

230

231 +* ab/reftable-aix-xlc-12 (2022-03-28) 1 commit

232 + - reftable: make assignments portable to AIX xlc v12.01

233

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.)

234 + Will merge to 'next'.

235 + source: <patch-1.1-98267695418-20220328T190642Z-avarab@gmail.com>

236

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>

237 +--------------------------------------------------

238 +[Stalled]

239

240 +* es/superproject-aware-submodules (2022-03-09) 3 commits

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

242 + . introduce submodule.hasSuperproject record

243 + . t7400-submodule-basic: modernize inspect() helper

244

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

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

246 + a submodule of a superproject.

247

258 - Test fixes.

259 - source: <20220223115347.3083-1-shivam828787@gmail.com>

248 + Expecting a reroll.

249 + cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>

250 + source: <20220310004423.2627181-1-emilyshaffer@google.com>

251

252 --------------------------------------------------

262 -[New Topics]

253 +[Cooking]

254

255 * ab/refs-various-fixes (2022-03-17) 5 commits

256 (merged to 'next' on 2022-03-18 at d65ed663a7)

@@ -276,19 +267,20 @@ Release tarballs are available at:

267

268

269 * 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

270 + (merged to 'next' on 2022-03-25 at 1f18ebad35)

271 + + reflog [show]: display sensible -h output

272 + + reflog: convert to parse_options() API

273 + + reflog exists: use parse_options() API

274 + + git reflog [expire|delete]: make -h output consistent with SYNOPSIS

275 + + reflog: move "usage" variables and use macros

276 + + reflog tests: add missing "git reflog exists" tests

277 + + reflog: refactor cmd_reflog() to "if" branches

278 + + reflog.c: indent argument lists

279

280 "git reflog" command now uses parse-options API to parse its

281 command line options.

282

291 - Will merge to 'next'?

283 + Will merge to 'master'.

284 source: <cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com>

285

286

@@ -316,17 +308,20 @@ Release tarballs are available at:

308 * kf/p4-multiple-remotes (2022-03-21) 1 commit

309 - git-p4: fix issue with multiple perforce remotes

310

311 + Needs review.

312 source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>

313

314

315 * ab/racy-hooks (2022-03-23) 1 commit

323 - - hooks: fix "invoked hook" regression in a8cc5943338

316 + (merged to 'next' on 2022-03-24 at 7c7d902a7c)

317 + + hooks: fix "invoked hook" regression in a8cc5943338

318

325 - Will merge to 'next'.

319 + Will merge to 'master'.

320 source: <patch-1.1-d0c9b430b2c-20220321T230933Z-avarab@gmail.com>

321

322

329 -* ds/partial-bundle-more (2022-03-23) 5 commits

323 +* ds/partial-bundle-more (2022-03-28) 6 commits

324 + - pack-objects: lazily set up "struct rev_info", don't leak

325 - bundle: output hash information in 'verify'

326 - bundle: move capabilities to end of 'verify'

327 - pack-objects: parse --filter directly into revs.filter

@@ -335,7 +330,7 @@ Release tarballs are available at:

330

331 Code clean-up.

332

338 - Will merge to 'next'?

333 + Will merge to 'next'.

334 source: <pull.1186.git.1647970119.gitgitgadget@gmail.com>

335

336

@@ -350,52 +345,6 @@ Release tarballs are available at:

345 Will merge to 'next'?

346 source: <20220319091141.4911-1-greenfoo@u92.eu>

347

353 ---------------------------------------------------

354 -[Stalled]

355 -

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

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 -

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 -

368 -

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

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

371 -

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

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

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

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

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

377 - blank page.

378 -

379 - Will discard; getting tired of waiting

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

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

382 -

383 -

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

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

386 - . editor: allow for saving/restoring terminal state

387 - . terminal: teach save_term to fail when not foreground

388 -

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

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

391 - the terminal state when needed.

392 -

393 - Will discard; getting tired of waiting

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

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

396 -

397 ---------------------------------------------------

398 -[Cooking]

348

349 * bc/stash-export (2022-03-16) 6 commits

350 - doc: add stash export and import to docs

@@ -424,25 +373,28 @@ Release tarballs are available at:

373

374 Move more "git submodule update" to C.

375

427 - Will merge to 'next'?

376 + Will merge to 'next'.

377 source: <20220315210925.79289-1-chooglen@google.com>

378

379

431 -* ns/batch-fsync (2022-03-21) 8 commits

380 +* ns/batch-fsync (2022-03-24) 12 commits

381 + - core.fsyncmethod: correctly camel-case warning message

382 - core.fsyncmethod: performance tests for add and stash

383 - core.fsyncmethod: tests for batch mode

384 + - test-lib-functions: add parsing helpers for ls-files and ls-tree

385 - core.fsync: use batch mode and sync loose objects by default on Windows

386 - unpack-objects: use the bulk-checkin infrastructure

387 - update-index: use the bulk-checkin infrastructure

388 - core.fsyncmethod: batched disk flushes for loose-objects

389 + - object-file: pass filename to fsync_or_die

390 - bulk-checkin: rename 'state' variable and separate 'plugged' boolean

391 + - bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'

392 - Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync

440 - (this branch uses ns/core-fsyncmethod.)

393

394 Introduce a filesystem-dependent mechanism to optimize the way the

395 bits for many loose object files are ensured to hit the disk

396 platter.

445 - source: <pull.1134.v2.git.1647760560.gitgitgadget@gmail.com>

397 + source: <pull.1134.v3.git.1648097906.gitgitgadget@gmail.com>

398

399

400 * vd/cache-bottom-fix (2022-03-17) 3 commits

@@ -457,23 +409,6 @@ Release tarballs are available at:

409 source: <pull.1179.v2.git.1647532536.gitgitgadget@gmail.com>

410

411

460 -* ns/core-fsyncmethod (2022-03-15) 6 commits

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 -

473 - Will merge to 'master'.

474 - source: <pull.1093.v6.git.1646952204.gitgitgadget@gmail.com>

475 -

476 -

412 * pw/add-p-single-key (2022-03-16) 5 commits

413 (merged to 'next' on 2022-03-23 at a00396d9a1)

414 + terminal: restore settings on SIGTSTP

@@ -516,20 +451,9 @@ Release tarballs are available at:

451 source: <pull.1226.v5.git.git.1647611643.gitgitgadget@gmail.com>

452

453

519 -* ps/fsync-refs (2022-03-15) 2 commits

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 -

528 - Will merge to 'master'.

529 - source: <47dd79106b93bb81750320d50ccaa74c24aacd28.1646992380.git.ps@pks.im>

530 -

531 -

532 -* vd/stash-silence-reset (2022-03-23) 8 commits

454 +* vd/stash-silence-reset (2022-03-24) 9 commits

455 + (merged to 'next' on 2022-03-24 at 94218f2a5f)

456 + + reset: show --no-refresh in the short-help

457 (merged to 'next' on 2022-03-23 at 932f4f6529)

458 + reset: remove 'reset.refresh' config option

459 + reset: remove 'reset.quiet' config option

@@ -546,7 +470,6 @@ Release tarballs are available at:

470 now "git reset" part has also been squelched.

471

472 Will merge to 'master'.

549 - source: <pull.1184.v2.git.1648059480.gitgitgadget@gmail.com>

473 source: <pull.1170.v3.git.1647308982.gitgitgadget@gmail.com>

474

475

@@ -570,7 +493,7 @@ Release tarballs are available at:

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

494 and more generalized "--format" option.

495

573 - Will merge to 'next'?

496 + Will merge to 'next'.

497 source: <cover.1648026472.git.dyroneteng@gmail.com>

498

499

@@ -602,6 +525,8 @@ Release tarballs are available at:

525 "git am" can read from the standard input when no mailbox is given

526 on the command line, but the end-user gets no indication when it

527 happens, making Git appear stuck.

528 +

529 + Will merge to 'next'?

530 source: <xmqqlexq8zqo.fsf@gitster.g>

531

532

@@ -634,15 +559,15 @@ Release tarballs are available at:

559

560

561 * js/ci-github-workflow-markup (2022-03-01) 9 commits

637 - - ci: call `finalize_test_case_output` a little later

638 - - ci: use `--github-workflow-markup` in the GitHub workflow

639 - - ci: optionally mark up output in the GitHub workflow

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

641 - - tests: refactor --write-junit-xml code

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

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

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

645 - - ci: fix code style

562 + . ci: call `finalize_test_case_output` a little later

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

564 + . ci: optionally mark up output in the GitHub workflow

565 + . test(junit): avoid line feeds in XML attributes

566 + . tests: refactor --write-junit-xml code

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

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

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

570 + . ci: fix code style

571

572 Update the GitHub workflow support to make it quicker to get to the

573 failing test.

@@ -665,11 +590,11 @@ Release tarballs are available at:

590 source: <20220217225408.GB7@edef91d97c94>

591

592

668 -* ab/http-gcc-12-workaround (2022-02-25) 1 commit

593 +* ab/http-gcc-12-workaround (2022-03-25) 1 commit

594 - http API: fix dangling pointer issue noted by GCC 12.0

595

596 Work around false warning pre-release of GCC 12.

672 - source: <patch-v2-1.1-777838267a5-20220225T090816Z-avarab@gmail.com>

597 + source: <patch-v3-1.1-69190804c67-20220325T143322Z-avarab@gmail.com>

598

599

600 * jd/prompt-upstream-mark (2022-03-23) 4 commits

@@ -698,8 +623,8 @@ Release tarballs are available at:

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

624

625

701 -* rc/fetch-refetch (2022-03-04) 7 commits

702 - - doc/partial-clone: mention --refetch fetch option

626 +* rc/fetch-refetch (2022-03-28) 7 commits

627 + - docs: mention --refetch fetch option

628 - fetch: after refetch, encourage auto gc repacking

629 - t5615-partial-clone: add test for fetch --refetch

630 - fetch: add --refetch option

@@ -711,9 +636,8 @@ Release tarballs are available at:

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

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

638

714 - Expecting a reroll.

715 - cf. <CAFLLRpLiCLiXkHNe2u4TKk-FjDy4LVZZR4qqxG+MamZYEFNUGg@mail.gmail.com>

716 - source: <pull.1138.v3.git.1646406274.gitgitgadget@gmail.com>

639 + Will merge to 'next'?

640 + source: <pull.1138.v4.git.1648476131.gitgitgadget@gmail.com>

641

642

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

@@ -751,7 +675,7 @@ Release tarballs are available at:

675 source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>

676

677

754 -* jh/builtin-fsmonitor-part3 (2022-03-23) 28 commits

678 +* jh/builtin-fsmonitor-part3 (2022-03-25) 28 commits

679 - t7527: test Unicode NFC/NFD handling on MacOS

680 - t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd

681 - fsmonitor: on macOS also emit NFC spelling for NFD pathname

@@ -783,30 +707,7 @@ Release tarballs are available at:

707 (this branch uses jh/builtin-fsmonitor-part2.)

708

709 More fsmonitor--daemon.

786 - source: <pull.1143.v3.git.1647973380.gitgitgadget@gmail.com>

787 -

788 -

789 -* gc/recursive-fetch-with-unused-submodules (2022-03-16) 10 commits

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

804 - in the superproject, it only paid attention to submodules that are

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 -

808 - Will merge to 'master'.

809 - source: <20220308001433.94995-1-chooglen@google.com>

710 + source: <pull.1143.v4.git.1648140680.gitgitgadget@gmail.com>

711

712

713 * js/bisect-in-c (2022-02-23) 14 commits

@@ -897,6 +798,8 @@ Release tarballs are available at:

798 - git-p4: add blank lines between functions and class definitions

799

800 Various cleanups to "git p4".

801 +

802 + Needs review.

803 source: <20220210164627.279520-1-jholdsworth@nvidia.com>

804

805

@@ -917,13 +820,14 @@ Release tarballs are available at:

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

821

822

920 -* jh/builtin-fsmonitor-part2 (2022-03-23) 29 commits

823 +* jh/builtin-fsmonitor-part2 (2022-03-25) 30 commits

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

825 - fsmonitor: force update index after large responses

826 - fsmonitor--daemon: use a cookie file to sync with file system

827 - fsmonitor--daemon: periodically truncate list of modified files

828 - t/perf/p7519: add fsmonitor--daemon test cases

829 - t/perf/p7519: speed up test on Windows

830 + - t/perf/p7519: fix coding style

831 - t/helper/test-chmtime: skip directories on Windows

832 - t/perf: avoid copying builtin fsmonitor files into test repo

833 - t7527: create test for fsmonitor--daemon

@@ -951,37 +855,5 @@ Release tarballs are available at:

855

856 Built-in fsmonitor (part 2).

857

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

960 - . rev-parse: short-circuit superproject worktree when config unset

961 - . introduce submodule.hasSuperproject record

962 - . t7400-submodule-basic: modernize inspect() helper

963 -

964 - A configuration variable in a repository tells if it is (or is not)

965 - a submodule of a superproject.

966 -

967 - Expecting a reroll.

968 - cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>

969 - source: <20220310004423.2627181-1-emilyshaffer@google.com>

970 -

971 ---------------------------------------------------

972 -[Discarded]

973 -

974 -* jc/parse-options-check (2022-03-01) 1 commit

975 - . parse-options: make parse_options_check() test-only

976 -

977 - Bypass sanity checks on the options array at runtime, and trigger

978 - them only during the tests.

979 - source: <xmqqr17lphav.fsf_-_@gitster.g>

980 -

981 -

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

983 - . merge: 'git merge --continue' is merely 'git commit'

984 -

985 - "git merge" documentation clarifies that "git commit" is sufficient

986 - to conclude an interrupted merge.

987 - source: <xmqq1qzmy55g.fsf@gitster.g>

858 + Will merge to 'next'?

859 + source: <pull.1041.v9.git.1648231393.gitgitgadget@gmail.com>

What's cooking (2022/03 #06)