04050d587c · 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 (Oct 2021, #07; Fri, 29)

4 -X-master-at: 7e27bd589d328b9daf154c2444d1a86ec3afedb0

5 -X-next-at: 81b53c28077674bc88b86c3c3dcc2dc94f93888f

3 +Subject: What's cooking in git.git (Nov 2021, #01; Mon, 1)

4 +X-master-at: 0cddd84c9f3e9c3d793ec93034ef679335f35e49

5 +X-next-at: 6d82a21a3b699caf378cb0f89b6b0e803fc58480

6

7 -What's cooking in git.git (Oct 2021, #07; Fri, 29)

7 +What's cooking in git.git (Nov 2021, #01; Mon, 1)

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

9

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

@@ -18,10 +18,6 @@ useful"). Do not read too much into a topic being in (or not in)

18 'seen'. The ones marked with '.' do not appear in any of the

19 integration branches, but I am still holding onto them.

20

21 -Git 2.34-rc0 has been tagged. There are still a few topics that

22 -want to be in the upcoming release in 'next', but from here on,

23 -let's concentrate more on fixes other than shiny new features.

24 -

21 Copies of the source code to Git live in many repositories, and the

22 following is a list of the ones I push into or their mirrors. Some

23 repositories have only a subset of branches.

@@ -53,184 +49,151 @@ Release tarballs are available at:

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

50 [Graduated to 'master']

51

56 -* ab/fix-make-lint-docs (2021-10-27) 1 commit

57 - (merged to 'next' on 2021-10-27 at 04f0be2a8b)

58 - + Documentation/Makefile: fix lint-docs mkdir dependency

59 -

60 - Hotfix for a topic recently merged to 'master'.

61 -

62 -

63 -* ab/make-sparse-for-real (2021-10-21) 1 commit

64 - (merged to 'next' on 2021-10-23 at f7a8389fb3)

65 - + Makefile: remove redundant GIT-CFLAGS dependency from "sparse"

66 -

67 - Fix-up for a recent topic.

68 -

69 -

70 -* ab/plug-handle-path-exclude-leak (2021-10-21) 1 commit

71 - (merged to 'next' on 2021-10-23 at 6be5d7bea8)

72 - + config.c: don't leak memory in handle_path_include()

73 -

74 - Leakfix.

75 -

76 -

77 -* ab/plug-random-leaks (2021-10-23) 6 commits

78 - (merged to 'next' on 2021-10-23 at 9c04a95718)

79 - + reflog: free() ref given to us by dwim_log()

80 - + submodule--helper: fix small memory leaks

81 - + clone: fix a memory leak of the "git_dir" variable

82 - + grep: fix a "path_list" memory leak

83 - + grep: use object_array_clear() in cmd_grep()

84 - + grep: prefer "struct grep_opt" over its "void *" equivalent

85 -

86 - Leakfix.

87 -

88 -

89 -* ab/ref-filter-leakfix (2021-10-20) 3 commits

90 - (merged to 'next' on 2021-10-23 at 8066971a3d)

91 - + branch: use ref_sorting_release()

92 - + ref-filter API user: add and use a ref_sorting_release()

93 - + tag: use a "goto cleanup" pattern, leak less memory

94 - (this branch is used by jc/fix-ref-sorting-parse.)

95 -

96 - "git for-each-ref" family of commands were leaking the ref_sorting

97 - instances that hold sorting keys specified by the user; this has

98 - been corrected.

99 -

100 -

101 -* ab/sh-retire-rebase-preserve-merges (2021-10-21) 2 commits

102 - (merged to 'next' on 2021-10-23 at f1fede7500)

103 - + git-sh-setup: remove messaging supporting --preserve-merges

104 - + git-sh-i18n: remove unused eval_ngettext()

105 -

106 - Code clean-up to remove unused helpers.

107 -

108 -

109 -* ab/test-bail (2021-10-14) 2 commits

110 - (merged to 'next' on 2021-10-23 at 4a16ebdb74)

111 - + test-lib.sh: use "Bail out!" syntax on bad SANITIZE=leak use

112 - + test-lib.sh: de-duplicate error() teardown code

113 -

114 - A new feature has been added to abort early in the test framework.

115 -

116 -

117 -* ab/unbundle-progress (2021-10-27) 1 commit

118 - (merged to 'next' on 2021-10-27 at a6ec5e5fb5)

119 - + git-bundle.txt: add missing words and punctuation

120 -

121 - Doc clarification.

122 -

123 -

124 -* bs/archive-doc-compression-level (2021-10-25) 1 commit

125 - (merged to 'next' on 2021-10-25 at 9360d864a2)

126 - + archive: describe compression level option

127 -

128 - Update "git archive" documentation and give explicit mention on the

129 - compression level for both zip and tar.gz format.

130 -

131 -

132 -* bs/doc-blame-color-lines (2021-10-20) 1 commit

133 - (merged to 'next' on 2021-10-23 at 4da10a5162)

134 - + git config doc: fix recent ASCIIDOC formatting regression

135 -

136 - Doc fix.

137 -

52 +* ab/ignore-replace-while-working-on-commit-graph (2021-10-15) 3 commits

53 + (merged to 'next' on 2021-10-25 at 5ed4266a96)

54 + + commit-graph: don't consider "replace" objects with "verify"

55 + + commit-graph tests: fix another graph_git_two_modes() helper

56 + + commit-graph tests: fix error-hiding graph_git_two_modes() helper

57 + (this branch is used by gc/use-repo-settings.)

58

139 -* cm/drop-xunsetenv (2021-10-29) 1 commit

140 - (merged to 'next' on 2021-10-29 at 3004dd0e66)

141 - + wrapper: remove xunsetenv()

59 + Teach "git commit-graph" command not to allow using replace objects

60 + at all, as we do not use the commit-graph at runtime when we see

61 + object replacement.

62

143 - Drop a helper function that has never been used since its addition.

63

64 +* ab/test-lib (2021-10-29) 1 commit

65 + (merged to 'next' on 2021-10-29 at b3d23601bd)

66 + + t5310: drop lib-bundle.sh include

67

146 -* jc/branch-copy-doc (2021-10-23) 1 commit

147 - (merged to 'next' on 2021-10-27 at efc3d30457)

148 - + branch (doc): -m/-c copies config and reflog

68 + Test (cosmetic) fix.

69

150 - "git branch -c/-m new old" was not described to copy config, which

151 - has been corrected.

70

71 +* gc/use-repo-settings (2021-10-15) 4 commits

72 + (merged to 'next' on 2021-10-25 at 3d38c09a8d)

73 + + gc: perform incremental repack when implictly enabled

74 + + fsck: verify multi-pack-index when implictly enabled

75 + + fsck: verify commit graph when implicitly enabled

76 + + Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings

77 + (this branch uses ab/ignore-replace-while-working-on-commit-graph.)

78

154 -* jk/http-push-status-fix (2021-10-18) 2 commits

155 - (merged to 'next' on 2021-10-23 at 9704ff261d)

156 - + transport-helper: recognize "expecting report" error from send-pack

157 - + send-pack: complain about "expecting report" with --helper-status

79 + It is wrong to read some settings directly from the config

80 + subsystem, as things like feature.experimental can affect their

81 + default values.

82

159 - "git push" client talking to an HTTP server did not diagnose the

160 - lack of the final status report from the other side correctly,

161 - which has been corrected.

83

84 +* hm/paint-hits-in-log-grep (2021-10-15) 4 commits

85 + (merged to 'next' on 2021-10-25 at e3edea3fa9)

86 + + grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data

87 + + pretty: colorize pattern matches in commit messages

88 + + grep: refactor next_match() and match_one_pattern() for external use

89 + + Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep

90

164 -* jk/log-warn-on-bogus-encoding (2021-10-29) 2 commits

165 - (merged to 'next' on 2021-10-29 at 7fa61a88f4)

166 - + log: document --encoding behavior on iconv() failure

167 - + Revert "logmsg_reencode(): warn when iconv() fails"

91 + "git log --grep=string --author=name" learns to highlight hits just

92 + like "git grep string" does.

93

169 - Squelch over-eager warning message added during this cycle.

94

95 +* jc/doc-format-patch-clarify-auto-base (2021-10-23) 1 commit

96 + (merged to 'next' on 2021-10-27 at 32c227324a)

97 + + format-patch (doc): clarify --base=auto

98

172 -* js/expand-runtime-prefix (2021-10-25) 1 commit

173 - (merged to 'next' on 2021-10-25 at 7ff05e8222)

174 - + config.txt: fix typo

99 + Rephrase the description of "format-patch --base=auto".

100

176 - Typofix.

101 +--------------------------------------------------

102 +[New Topics]

103

104 +* ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits

105 + - leak tests: mark some fast-import tests as passing with SANITIZE=leak

106 + - leak tests: mark some config tests as passing with SANITIZE=leak

107 + - leak tests: mark some status tests as passing with SANITIZE=leak

108 + - leak tests: mark some clone tests as passing with SANITIZE=leak

109 + - leak tests: mark some add tests as passing with SANITIZE=leak

110 + - leak tests: mark some diff tests as passing with SANITIZE=leak

111 + - leak tests: mark some apply tests as passing with SANITIZE=leak

112 + - leak tests: mark some notes tests as passing with SANITIZE=leak

113 + - leak tests: mark some update-index tests as passing with SANITIZE=leak

114 + - leak tests: mark some rev-parse tests as passing with SANITIZE=leak

115 + - leak tests: mark some rev-list tests as passing with SANITIZE=leak

116 + - leak tests: mark some misc tests as passing with SANITIZE=leak

117 + - leak tests: mark most gettext tests as passing with SANITIZE=leak

118 + - leak tests: mark "sort" test as passing SANITIZE=leak

119 + - leak tests: mark a read-tree test as passing SANITIZE=leak

120 + (this branch uses jx/message-fixes.)

121 +

122 + More tests are marked as leak-free.

123 +

124 +

125 +* rs/ssh-signing-fix (2021-11-01) 2 commits

126 + (merged to 'next' on 2021-11-01 at f50e78f952)

127 + + gpg-interface: avoid buffer overrun in parse_ssh_output()

128 + + gpg-interface: handle missing " with " gracefully in parse_ssh_output()

129 +

130 + Fixes to recently merged topic.

131

179 -* ks/submodule-add-message-fix (2021-10-27) 2 commits

180 - (merged to 'next' on 2021-10-27 at 4fc7c47990)

181 - + submodule: drop unused sm_name parameter from append_fetch_remotes()

182 - (merged to 'next' on 2021-10-25 at 377e759528)

183 - + submodule--helper: fix incorrect newlines in an error message

132 + Will merge to 'master'.

133

185 - Message regression fix.

134

135 +* jx/message-fixes (2021-10-31) 1 commit

136 + (merged to 'next' on 2021-11-01 at f27cf92855)

137 + + i18n: fix typos found during l10n for git 2.34.0

138 + (this branch is used by ab/mark-leak-free-tests-even-more.)

139

188 -* ma/doc-folder-to-directory (2021-10-25) 3 commits

189 - (merged to 'next' on 2021-10-27 at 99200092f7)

190 - + gitweb.txt: change "folder" to "directory"

191 - + gitignore.txt: change "folder" to "directory"

192 - + git-multi-pack-index.txt: change "folder" to "directory"

140 + Fixes to recently added messages.

141

194 - Consistently use 'directory', not 'folder', to call the filesystem

195 - entity that collects a group of files and, eh, directories.

142 + Will merge to 'master'.

143

144 +--------------------------------------------------

145 +[Stalled]

146

198 -* ma/doc-git-version (2021-10-25) 1 commit

199 - (merged to 'next' on 2021-10-25 at 9f74afec0c)

200 - + git.txt: fix typo

147 +* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit

148 + - submodule: absorb git dir instead of dying on deinit

149

202 - Typofix.

150 + "git submodule deinit" for a submodule whose .git metadata

151 + directory is embedded in its working tree refused to work, until

152 + the submodule gets converted to use the "absorbed" form where the

153 + metadata directory is stored in superproject, and a gitfile at the

154 + top-level of the working tree of the submodule points at it. The

155 + command is taught to convert such submodules to the absorbed form

156 + as needed.

157

158 + Expecting a reroll.

159 + cf. <xmqqwnmopqqk.fsf@gitster.g>

160

205 -* mt/fix-add-rm-with-sparse-index (2021-10-28) 1 commit

206 - (merged to 'next' on 2021-10-29 at 06f21a49b1)

207 - + add, rm, mv: fix bug that prevents the update of non-sparse dirs

161

209 - Fix-up to a topic already merged to 'master'.

162 +* ar/submodule-update (2021-10-13) 9 commits

163 + . submodule--helper: rename helper functions

164 + . submodule--helper: remove unused helpers

165 + . submodule: move core cmd_update() logic to C

166 + . submodule--helper: run update using child process struct

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

168 + . submodule--helper: refactor get_submodule_displaypath()

169 + . submodule--helper: rename helpers for update-clone

170 + . submodule--helper: get remote names from any repository

171 + . submodule--helper: split up ensure_core_worktree()

172

173 + Rewrite of "git submodule update" in C.

174

212 -* re/completion-fix-test-equality (2021-10-28) 1 commit

213 - (merged to 'next' on 2021-10-29 at 78decd16a0)

214 - + completion: fix incorrect bash/zsh string equality check

175 + Kicked out of 'seen' to make room for es/superproject-aware-submodules

176 + which is among the topics this topic stomps on.

177

216 - Fix long-standing shell syntax error in the completion script.

178

179 +* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit

180 + - fetch: fix segfault on --set-upstream while on a detached HEAD

181

219 -* sg/sparse-index-not-that-common-a-command (2021-10-25) 1 commit

220 - (merged to 'next' on 2021-10-27 at 020dc425a4)

221 - + command-list.txt: remove 'sparse-index' from main help

182 + "git fetch --set-upstream" while on detached HEAD segfaulted

183 + instead of noticing that such an operation did not make sense.

184

223 - Drop "git sparse-index" from the list of common commands.

185 + Getting tired of waiting for a reroll; will discard.

186

187 --------------------------------------------------

226 -[New Topics]

188 +[Cooking]

189

190 * ar/fix-git-pull-no-verify (2021-10-28) 1 commit

229 - - pull: honor --no-verify and do not call the commit-msg hook

191 + (merged to 'next' on 2021-11-01 at 74677b0a76)

192 + + pull: honor --no-verify and do not call the commit-msg hook

193

194 "git pull --no-verify" did not affect the underlying "git merge".

195

233 - Will merge to 'next'.

196 + Will merge to 'master'.

197

198

199 * if/redact-packfile-uri (2021-10-29) 2 commits

@@ -241,11 +204,12 @@ Release tarballs are available at:

204

205

206 * ar/no-verify-doc (2021-10-29) 1 commit

244 - - Document positive variant of commit and merge option "--no-verify"

207 + (merged to 'next' on 2021-11-01 at f6809a9ddb)

208 + + Document positive variant of commit and merge option "--no-verify"

209

210 Doc update.

211

248 - Will merge to 'next'.

212 + Will merge to 'master'.

213

214

215 * ew/test-wo-fsync (2021-10-29) 1 commit

@@ -268,7 +232,7 @@ Release tarballs are available at:

232

233 Doc update.

234

271 - Will merge to 'next'.

235 + Under discussion.

236

237

238 * re/color-default-reset (2021-10-28) 3 commits

@@ -279,15 +243,6 @@ Release tarballs are available at:

243 "default" and "reset" colors have been added to our palette.

244

245

282 -* ab/test-lib (2021-10-29) 1 commit

283 - (merged to 'next' on 2021-10-29 at b3d23601bd)

284 - + t5310: drop lib-bundle.sh include

285 -

286 - Test (cosmetic) fix.

287 -

288 - Will merge to 'master'.

289 -

290 -

246 * jc/fix-first-object-walk (2021-10-29) 2 commits

247 - docs: add headers in MyFirstObjectWalk

248 - docs: fix places that break compilation in MyFirstObjectWalk

@@ -296,13 +251,14 @@ Release tarballs are available at:

251

252

253 * jc/unsetenv-returns-an-int (2021-10-29) 1 commit

299 - - unsetenv(3) returns int, not void

254 + (merged to 'next' on 2021-11-01 at a11670a5a5)

255 + + unsetenv(3) returns int, not void

256

257 The compatibility implementation for unsetenv(3) were written to

258 mimic ancient, non-POSIX, variant seen in an old glibc; it has been

259 changed to return an integer to match the more modern era.

260

305 - Will merge to 'next'.

261 + Will cook in 'next'.

262

263

264 * mc/clean-smudge-with-llp64 (2021-10-29) 8 commits

@@ -315,51 +271,6 @@ Release tarballs are available at:

271 - test-tool genzeros: generate large amounts of data more efficiently

272 - test-genzeros: allow more than 2G zeros in Windows

273

318 ---------------------------------------------------

319 -[Stalled]

320 -

321 -* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit

322 - - submodule: absorb git dir instead of dying on deinit

323 -

324 - "git submodule deinit" for a submodule whose .git metadata

325 - directory is embedded in its working tree refused to work, until

326 - the submodule gets converted to use the "absorbed" form where the

327 - metadata directory is stored in superproject, and a gitfile at the

328 - top-level of the working tree of the submodule points at it. The

329 - command is taught to convert such submodules to the absorbed form

330 - as needed.

331 -

332 - Expecting a reroll.

333 - cf. <xmqqwnmopqqk.fsf@gitster.g>

334 -

335 -

336 -* ar/submodule-update (2021-10-13) 9 commits

337 - . submodule--helper: rename helper functions

338 - . submodule--helper: remove unused helpers

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

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

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

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

343 - . submodule--helper: rename helpers for update-clone

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

345 - . submodule--helper: split up ensure_core_worktree()

346 -

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

348 -

349 - Kicked out of 'seen' to make room for es/superproject-aware-submodules

350 - which is among the topics this topic stomps on.

351 -

352 -

353 -* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit

354 - - fetch: fix segfault on --set-upstream while on a detached HEAD

355 -

356 - "git fetch --set-upstream" while on detached HEAD segfaulted

357 - instead of noticing that such an operation did not make sense.

358 -

359 - Getting tired of waiting for a reroll; will discard.

360 -

361 ---------------------------------------------------

362 -[Cooking]

274

275 * pw/diff-color-moved-fix (2021-10-27) 15 commits

276 - diff --color-moved: intern strings

@@ -436,22 +347,23 @@ Release tarballs are available at:

347

348

349 * tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits

439 - - pack-bitmap.c: more aggressively free in free_bitmap_index()

440 - - pack-bitmap.c: don't leak type-level bitmaps

441 - - midx.c: write MIDX filenames to strbuf

442 - - builtin/multi-pack-index.c: don't leak concatenated options

443 - - builtin/repack.c: avoid leaking child arguments

444 - - builtin/pack-objects.c: don't leak memory via arguments

445 - - t/helper/test-read-midx.c: free MIDX within read_midx_file()

446 - - midx.c: don't leak MIDX from verify_midx_file

447 - - midx.c: clean up chunkfile after reading the MIDX

350 + (merged to 'next' on 2021-11-01 at 47d218862b)

351 + + pack-bitmap.c: more aggressively free in free_bitmap_index()

352 + + pack-bitmap.c: don't leak type-level bitmaps

353 + + midx.c: write MIDX filenames to strbuf

354 + + builtin/multi-pack-index.c: don't leak concatenated options

355 + + builtin/repack.c: avoid leaking child arguments

356 + + builtin/pack-objects.c: don't leak memory via arguments

357 + + t/helper/test-read-midx.c: free MIDX within read_midx_file()

358 + + midx.c: don't leak MIDX from verify_midx_file

359 + + midx.c: clean up chunkfile after reading the MIDX

360

361 Leakfix.

362

451 - Will merge to 'next'?

363 + Will cook in 'next'.

364

365

454 -* es/pretty-describe-more (2021-10-29) 3 commits

366 +* es/pretty-describe-more (2021-11-01) 3 commits

367 - pretty: add abbrev option to %(describe)

368 - pretty: add tag option to %(describe)

369 - pretty.c: rework describe options parsing for better extensibility

@@ -475,15 +387,6 @@ Release tarballs are available at:

387 attention to the key validity time range when verifying.

388

389

478 -* jc/doc-format-patch-clarify-auto-base (2021-10-23) 1 commit

479 - (merged to 'next' on 2021-10-27 at 32c227324a)

480 - + format-patch (doc): clarify --base=auto

481 -

482 - Rephrase the description of "format-patch --base=auto".

483 -

484 - Will merge to 'master'.

485 -

486 -

390 * jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits

391 - (wip) reword the final review part

392 - SubmittingPatchs: clarify choice of base and testing

@@ -493,11 +396,12 @@ Release tarballs are available at:

396

397

398 * rd/http-backend-code-simplification (2021-10-25) 1 commit

496 - - http-backend: remove a duplicated code branch

399 + (merged to 'next' on 2021-11-01 at f45b33890c)

400 + + http-backend: remove a duplicated code branch

401

498 - (slight) Code simplification.

402 + Code simplification.

403

500 - Will merge to 'next'?

404 + Will merge to 'master'.

405

406

407 * gc/remote-with-fewer-static-global-variables (2021-10-28) 6 commits

@@ -524,7 +428,7 @@ Release tarballs are available at:

428 Will cook in 'next'.

429

430

527 -* ab/config-based-hooks-2 (2021-10-20) 14 commits

431 +* ab/config-based-hooks-2 (2021-11-01) 18 commits

432 - run-command: remove old run_hook_{le,ve}() hook API

433 - receive-pack: convert push-to-checkout hook to hook.h

434 - read-cache: convert post-index-change to use hook.h

@@ -532,31 +436,21 @@ Release tarballs are available at:

436 - git-p4: use 'git hook' to run hooks

437 - send-email: use 'git hook run' for 'sendemail-validate'

438 - git hook run: add an --ignore-missing flag

439 + - hooks: convert worktree 'post-checkout' hook to hook library

440 + - hooks: convert non-worktree 'post-checkout' hook to hook library

441 - merge: convert post-merge to use hook.h

536 - - hooks: convert 'post-checkout' hook to hook library

537 - - am: convert applypatch to use hook.h

442 + - am: convert applypatch-msg to use hook.h

443 - rebase: convert pre-rebase to use hook.h

444 + - hook API: add a run_hooks_l() wrapper

445 + - am: convert {pre,post}-applypatch to use hook.h

446 - gc: use hook library for pre-auto-gc hook

447 + - hook API: add a run_hooks() wrapper

448 - hook: add 'run' subcommand

449 - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2

450

451 More "config-based hooks".

452

453

546 -* ab/ignore-replace-while-working-on-commit-graph (2021-10-15) 3 commits

547 - (merged to 'next' on 2021-10-25 at 5ed4266a96)

548 - + commit-graph: don't consider "replace" objects with "verify"

549 - + commit-graph tests: fix another graph_git_two_modes() helper

550 - + commit-graph tests: fix error-hiding graph_git_two_modes() helper

551 - (this branch is used by gc/use-repo-settings.)

552 -

553 - Teach "git commit-graph" command not to allow using replace objects

554 - at all, as we do not use the commit-graph at runtime when we see

555 - object replacement.

556 -

557 - Will merge to 'master'.

558 -

559 -

454 * so/stash-staged (2021-10-28) 2 commits

455 (merged to 'next' on 2021-10-29 at 50335e8eeb)

456 + stash: get rid of unused argument in stash_staged()

@@ -716,21 +610,6 @@ Release tarballs are available at:

610 Ready?

611

612

719 -* gc/use-repo-settings (2021-10-15) 4 commits

720 - (merged to 'next' on 2021-10-25 at 3d38c09a8d)

721 - + gc: perform incremental repack when implictly enabled

722 - + fsck: verify multi-pack-index when implictly enabled

723 - + fsck: verify commit graph when implicitly enabled

724 - + Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings

725 - (this branch uses ab/ignore-replace-while-working-on-commit-graph.)

726 -

727 - It is wrong to read some settings directly from the config

728 - subsystem, as things like feature.experimental can affect their

729 - default values.

730 -

731 - Will merge to 'master'.

732 -

733 -

613 * pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits

614 - rebase -m: don't fork git checkout

615 - rebase --apply: set ORIG_HEAD correctly

@@ -767,26 +646,14 @@ Release tarballs are available at:

646

647

648 * tp/send-email-completion (2021-10-28) 2 commits

770 - - send-email docs: add format-patch options

771 - - send-email: programmatically generate bash completions

649 + (merged to 'next' on 2021-11-01 at 7104356cc0)

650 + + send-email docs: add format-patch options

651 + + send-email: programmatically generate bash completions

652

653 The command line complation for "git send-email" options have been

654 tweaked to make it easier to keep it in sync with the command itself.

655

776 - Will merge to 'next'?

777 -

778 -

779 -* hm/paint-hits-in-log-grep (2021-10-15) 4 commits

780 - (merged to 'next' on 2021-10-25 at e3edea3fa9)

781 - + grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data

782 - + pretty: colorize pattern matches in commit messages

783 - + grep: refactor next_match() and match_one_pattern() for external use

784 - + Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep

785 -

786 - "git log --grep=string --author=name" learns to highlight hits just

787 - like "git grep string" does.

788 -

789 - Will merge to 'master'.

656 + Will cook in 'next'.

657

658

659 * ns/batched-fsync (2021-10-27) 9 commits

@@ -877,7 +744,7 @@ Release tarballs are available at:

744 Will cook in 'next'.

745

746

880 -* ab/only-single-progress-at-once (2021-10-27) 8 commits

747 +* ab/only-single-progress-at-once (2021-11-01) 8 commits

748 - progress.c: add & assert a "global_progress" variable

749 - various *.c: use isatty(1|2), not isatty(STDIN_FILENO|STDERR_FILENO)

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

@@ -917,30 +784,3 @@ Release tarballs are available at:

784

785 The "reftable" backend for the refs API, without integrating into

786 the refs subsystem.

920 -

921 ---------------------------------------------------

922 -[Discarded]

923 -

924 -* en/remerge-diff (2021-08-31) 7 commits

925 - . doc/diff-options: explain the new --remerge-diff option

926 - . show, log: provide a --remerge-diff capability

927 - . tmp-objdir: new API for creating and removing primary object dirs

928 - . merge-ort: capture and print ll-merge warnings in our preferred fashion

929 - . ll-merge: add API for capturing warnings in a strbuf instead of stderr

930 - . merge-ort: add ability to record conflict messages in a file

931 - . merge-ort: mark a few more conflict messages as omittable

932 -

933 - A new presentation for two-parent merge "--remerge-diff" can be

934 - used to show the difference between mechanical (and possibly

935 - conflicted) merge results and the recorded resolution.

936 -

937 -

938 -* rb/doc-commit-header-continuation-line (2021-10-11) 1 commit

939 - . signature-format.txt: add space to fix gpgsig continuation line

940 -

941 - Values in the header portion of commit object can be multi-lined

942 - by a single SP indentation of the second and subsequent lines, and

943 - this applies to an empty line as well. Update an example in the

944 - technical documentation to highlight it.

945 -

946 - Superseded by the jc/doc-commit-header-continuation-line topic.

What's cooking (2021/11 #01)