5877042f5a · matheusbsbs/matheus-bagliano

@@ -1,22 +1,34 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Nov 2021, #06; Wed, 24)

4 -X-master-at: 35151cf0720460a897cde9b8039af364743240e7

5 -X-next-at: a245620fadb0d35540dd0d2184f0f8314eb97080

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

4 +X-master-at: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa

5 +X-next-at: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa

6

7 -What's cooking in git.git (Nov 2021, #06; Wed, 24)

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

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

9

10 -As 2.34.0 cycle was run rather loosely, we saw our share of

11 -regressions in the release. Hopefully we have caught the major ones

12 -and fixed them all in the 2.34.1 maintenance release that was just

13 -tagged.

10 +As promised, most of the topics that have been cooking in 'next'

11 +since the previous release cycle have been merged to 'master' to

12 +start a new cycle, with a small exception. The tip of 'next' has

13 +been rewound and there is 0 topics on it right now.

14 +

15 +The exception is 'ns/tmp-objdir' and a few topics that depend on it,

16 +which are kicked out of 'next' to give the base topic a chance to

17 +lose the two "fixup!" band-aid. Careful re-reading of the topic by

18 +somebody with a fresh set of eyes (meaning, everybody, as this has

19 +been dormant for almost a month) is very much appreciated to move

20 +things forward. Also ns/remerge-diff that is Neeraj's rebase of the

21 +remerge-diff topic needs Elijah's Ack at least.

22 +

23 +Many of the new patches in 'seen' since the last cycle ended are

24 +truly 'just seen' and not 'read' at all, as you can see from the

25 +lack of any topic description to speak of in the following list.

26 +Help is appreciated here, too. Before whipping them into some

27 +presentable shape, I wouldn't be able to take any more new topics.

28 +

29 +

30 +

31

15 -I've marked most of the topics that are in 'next' for the 'master'

16 -branch, except for a few topics, but if there are topics that should

17 -be rethought instead, please holler. Once flushing these topics

18 -down to 'master', the tip of 'next' will be rewound and then we'll

19 -start taking new topics to it.

32

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

34 prefixed with '+' are in 'next' (being in 'next' is a sign that a

@@ -66,44 +78,225 @@ Release tarballs are available at:

78 --------------------------------------------------

79 [Graduated to 'master']

80

69 -* ab/update-submitting-patches (2021-11-13) 1 commit

70 - (merged to 'next' on 2021-11-19 at b44f4d0eb0)

71 - + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section

81 +* ab/refs-errno-cleanup (2021-10-16) 21 commits

82 + (merged to 'next' on 2021-10-29 at 3f57147176)

83 + + refs API: post-migration API renaming [2/2]

84 + + refs API: post-migration API renaming [1/2]

85 + + refs API: don't expose "errno" in run_transaction_hook()

86 + + refs API: make expand_ref() & repo_dwim_log() not set errno

87 + + refs API: make resolve_ref_unsafe() not set errno

88 + + refs API: make refs_ref_exists() not set errno

89 + + refs API: make refs_resolve_refdup() not set errno

90 + + refs tests: ignore ignore errno in test-ref-store helper

91 + + refs API: ignore errno in worktree.c's find_shared_symref()

92 + + refs API: ignore errno in worktree.c's add_head_info()

93 + + refs API: make files_copy_or_rename_ref() et al not set errno

94 + + refs API: make loose_fill_ref_dir() not set errno

95 + + refs API: make resolve_gitlink_ref() not set errno

96 + + refs API: remove refs_read_ref_full() wrapper

97 + + refs/files: remove "name exist?" check in lock_ref_oid_basic()

98 + + reflog tests: add --updateref tests

99 + + refs API: make refs_rename_ref_available() static

100 + + refs API: make parse_loose_ref_contents() not set errno

101 + + refs API: make refs_read_raw_ref() not set errno

102 + + refs API: add a version of refs_resolve_ref_unsafe() with "errno"

103 + + branch tests: test for errno propagating on failing read

104 +

105 + The "remainder" of hn/refs-errno-cleanup topic.

106 +

107 +

108 +* ab/sh-retire-helper-functions (2021-10-21) 6 commits

109 + (merged to 'next' on 2021-11-03 at 4b49d9f4be)

110 + + git-sh-setup: remove "sane_grep", it's not needed anymore

111 + + git-sh-setup: remove unused sane_egrep() function

112 + + git-instaweb: unconditionally assume that gitweb is mod_perl capable

113 + + Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)

114 + + Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)

115 + + Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)

116 + (this branch is used by ab/make-dependency.)

117 +

118 + Make a few helper functions unused and then lose them.

119 +

120 +

121 +* jc/fix-ref-sorting-parse (2021-10-20) 2 commits

122 + (merged to 'next' on 2021-10-29 at e3ec6e8e77)

123 + + for-each-ref: delay parsing of --sort=<atom> options

124 + + Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse

125 +

126 + Things like "git -c branch.sort=bogus branch new HEAD", i.e. the

127 + operation modes of the "git branch" command that do not need the

128 + sort key information, no longer errors out by seeing a bogus sort

129 + key.

130 +

131 +

132 +* jc/tutorial-format-patch-base (2021-10-23) 1 commit

133 + (merged to 'next' on 2021-10-29 at 67ff1a5a77)

134 + + MyFirstContribution: teach to use "format-patch --base=auto"

135 +

136 + Teach and encourage first-time contributors to this project to

137 + state the base commit when they submit their topic.

138 +

139 +

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

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

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

143 +

144 + The compatibility implementation for unsetenv(3) were written to

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

146 + changed to return an integer to match the more modern era.

147 +

148

73 - Doc fix.

149 +* jk/loosen-urlmatch (2021-10-12) 1 commit

150 + (merged to 'next' on 2021-10-25 at f66ca39ebe)

151 + + urlmatch: add underscore to URL_HOST_CHARS

152 +

153 + Treat "_" as any other URL-valid characters in an URL when matching

154 + the per-URL configuration variable names.

155 +

156 +

157 +* mc/clean-smudge-with-llp64 (2021-11-03) 8 commits

158 + (merged to 'next' on 2021-11-03 at fe5160a170)

159 + + clean/smudge: allow clean filters to process extremely large files

160 + + odb: guard against data loss checking out a huge file

161 + + git-compat-util: introduce more size_t helpers

162 + + odb: teach read_blob_entry to use size_t

163 + + t1051: introduce a smudge filter test for extremely large files

164 + + test-lib: add prerequisite for 64-bit platforms

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

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

167 +

168 + The clean/smudge conversion code path has been prepared to better

169 + work on platforms where ulong is narrower than size_t.

170

171

76 -* ds/add-rm-with-sparse-index (2021-11-22) 1 commit

77 - - dir: revert "dir: select directories correctly"

172 +* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits

173 + (merged to 'next' on 2021-10-29 at 1a01b886e5)

174 + + status: print stash info with --porcelain=v2 --show-stash

175 + + status: count stash entries in separate function

176

79 - Regression fix for 2.34

177 + Allow "git status --porcelain=v2" to show the number of stash

178 + entries with --show-stash like the normal output does.

179

180

82 -* ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit

83 - (merged to 'next' on 2021-11-19 at 2d8f0cd000)

84 - + pull: should be noop when already-up-to-date

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

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

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

184 + (merged to 'next' on 2021-10-25 at 68b88e35c4)

185 + + stash: implement '--staged' option for 'push' and 'save'

186

86 - "git pull" with any strategy when the other side is behind us

87 - should succeed as it is a no-op, but doesn't.

187 + "git stash" learned the "--staged" option to stash away what has

188 + been added to the index (and nothing else).

189

190

90 -* hm/paint-hits-in-log-grep (2021-11-19) 1 commit

91 - (merged to 'next' on 2021-11-19 at e146d25c7c)

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

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

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

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

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

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

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

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

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

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

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

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

202

94 - "git grep" looking in a blob that has non-UTF8 payload was

95 - completely broken when linked with versions of PCREv2 library older

96 - than 10.34 in the latest release.

203 + Leakfix.

204

205

99 -* jc/save-restore-terminal-revert (2021-11-22) 1 commit

100 - - Revert "editor: save and reset terminal after calling EDITOR"

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

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

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

209 + + send-email: programmatically generate bash completions

210

102 - Regression fix for 2.34

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

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

213

214 --------------------------------------------------

215 [New Topics]

216

217 +* ab/ambiguous-object-name (2021-11-26) 6 commits

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

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

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

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

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

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

224 +

225 +

226 +* cb/add-p-single-key-fix (2021-11-28) 1 commit

227 + - add -p: avoid use of undefined $key when ReadKey -> EOF

228 +

229 +

230 +* cb/mingw-gmtime-r (2021-11-27) 1 commit

231 + - mingw: avoid fallback for {local,gm}time_r()

232 +

233 +

234 +* ds/trace2-regions-in-tests (2021-11-29) 2 commits

235 + - t/t*: remove custom GIT_TRACE2_EVENT_NESTING

236 + - test-lib.sh: set GIT_TRACE2_EVENT_NESTING

237 +

238 +

239 +* hn/allow-bogus-oid-in-ref-tests (2021-11-29) 6 commits

240 + - t1430: create valid symrefs using test-helper

241 + - t1430: remove refs using test-tool

242 + - refs: add REF_SKIP_REFNAME_VERIFICATION flag

243 + - refs: allow skipping OID verification

244 + - refs: update comment.

245 + - test-ref-store: plug memory leak in cmd_delete_refs

246 +

247 +

248 +* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit

249 + - t1404: mark directory/file conflict tests with REFFILES

250 +

251 +

252 +* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit

253 + - refs: document callback for reflog-ent iterators

254 +

255 +

256 +* po/size-t-for-vs (2021-11-26) 3 commits

257 + - object-file.c: LLP64 compatibility, upcast unity for left shift

258 + - diffcore-delta.c: LLP64 compatibility, upcast unity for left shift

259 + - repack.c: LLP64 compatibility, upcast unity for left shift

260 +

261 +

262 +* yn/complete-date-format-options (2021-11-25) 1 commit

263 + - completion: add human and auto: date format

264 +

265 +

266 +* jc/grep-patterntype-default-doc (2021-11-29) 1 commit

267 + - grep: clarify what `grep.patternType=default` means

268 +

269 +--------------------------------------------------

270 +[Stalled]

271 +

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

273 + . submodule--helper: rename helper functions

274 + . submodule--helper: remove unused helpers

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

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

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

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

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

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

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

282 +

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

284 +

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

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

287 +

288 +

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

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

291 +

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

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

294 +

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

296 +

297 +--------------------------------------------------

298 +[Cooking]

299 +

300 * ab/ci-updates (2021-11-23) 5 commits

301 - CI: don't run "make test" twice in one job

302 - CI: use "$runs_on_pool", not "$jobname" to select packages & config

@@ -111,44 +304,68 @@ Release tarballs are available at:

304 - CI: use shorter names that fit in UX tooltips

305 - CI: remove Travis CI support

306

307 + Drop support for TravisCI and update test workflows at GitHub.

308

115 -* en/keep-cwd (2021-11-20) 8 commits

116 - - dir: avoid removing the current working directory

117 - - stash: do not attempt to remove current working directory

118 - - clean: do not attempt to remove current working directory

119 - - symlinks: do not include current working directory in dir removal

309 +

310 +* en/keep-cwd (2021-11-29) 11 commits

311 + - t2501: simplify the tests since we can now assume desired behavior

312 + - dir: new flag to remove_dir_recurse() to spare the original_cwd

313 + - dir: avoid incidentally removing the original_cwd in remove_path()

314 + - stash: do not attempt to remove startup_info->original_cwd

315 + - rebase: do not attempt to remove startup_info->original_cwd

316 + - clean: do not attempt to remove startup_info->original_cwd

317 + - symlinks: do not include startup_info->original_cwd in dir removal

318 - unpack-trees: add special cwd handling

121 - - unpack-trees: refuse to remove the current working directory

122 - - repository, setup: introduce the_cwd

319 + - unpack-trees: refuse to remove startup_info->original_cwd

320 + - setup: introduce startup_info->original_cwd

321 - t2501: add various tests for removing the current working directory

322

323

126 -* ab/run-command (2021-11-22) 5 commits

324 +* ab/run-command (2021-11-25) 9 commits

325 + - run-command API: remove "env" member, always use "env_array"

326 + - difftool: use "env_array" to simplify memory management

327 - run-command API: remove "argv" member, always use "args"

328 + - run-command API users: use strvec_push(), not argv construction

329 - run-command API users: use strvec_pushl(), not argv construction

330 + - run-command tests: use strvec_pushv(), not argv assignment

331 - run-command API users: use strvec_pushv(), not argv assignment

332 - upload-archive: use regular "struct child_process" pattern

131 - - archive-tar: use our own cmd.buf in error message

333 + - worktree: stop being overly intimate with run_command() internals

334

335

336 * hn/create-reflog-simplify (2021-11-22) 1 commit

337 - refs: drop force_create argument of create_reflog API

338

339 + A small simplification of API.

340 +

341 + Will merge to 'next'.

342 +

343

138 -* hn/reflog-tests (2021-11-22) 4 commits

139 - - t1400: use test-helper ref-store to inspect reflog contents

344 +* hn/reflog-tests (2021-11-25) 5 commits

345 + - refs/debug: trim trailing LF from reflog message

346 - test-ref-store: tweaks to for-each-reflog-ent format

141 - - refs: trim newline from reflog message

347 + - t1405: check for_each_reflog_ent_reverse() more thoroughly

348 + - test-ref-store: don't add newline to reflog message

349 - show-branch: show reflog message

350

351 + Prepare tests on ref API to help testing reftable backends.

352 +

353

354 * jt/midx-doc-fix (2021-11-22) 1 commit

355 - Doc: no midx and partial clone relation

356

357 + Docfix.

358 +

359 + Will merge to 'next'.

360 +

361

362 * tl/ls-tree-oid-only (2021-11-22) 1 commit

363 - ls-tree.c: support `--oid-only` option for "git-ls-tree"

364

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

366 +

367 + Expecting a reroll.

368 +

369

370 * jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits

371 - t7006: simplify exit-code checks for sigpipe tests

@@ -168,36 +385,6 @@ Release tarballs are available at:

385 * em/missing-pager (2021-11-24) 1 commit

386 - pager: fix crash when pager program doesn't exist

387

171 ---------------------------------------------------

172 -[Stalled]

173 -

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

175 - . submodule--helper: rename helper functions

176 - . submodule--helper: remove unused helpers

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

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

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

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

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

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

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

184 -

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

186 -

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

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

189 -

190 -

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

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

193 -

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

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

196 -

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

198 -

199 ---------------------------------------------------

200 -[Cooking]

388

389 * ab/checkout-branch-info-leakfix (2021-11-18) 1 commit

390 - checkout: fix "branch info" memory leaks

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

419 - Makefile: don't set up "perl/build" rules under NO_PERL=Y

420 - Makefile: don't invoke msgfmt with --statistics

421 - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency

235 - (this branch uses ab/sh-retire-helper-functions.)

422 +

423 + Dependency clean-up.

424

425

426 * ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit

@@ -245,7 +433,7 @@ Release tarballs are available at:

433 Will merge to 'next'.

434

435

248 -* ds/fetch-pull-with-sparse-index (2021-11-18) 3 commits

436 +* ds/fetch-pull-with-sparse-index (2021-11-29) 3 commits

437 - ls-files: add --sparse option

438 - fetch/pull: use the sparse index

439 - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index

@@ -266,18 +454,24 @@ Release tarballs are available at:

454 and optionally error out when prerequisites that are expected to be

455 satisfied are not.

456

457 + Will merge to 'next'?

458 +

459

460 * jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit

461 - t5319: corrupt more bytes of the midx checksum

462

463 Test fix.

464

465 + Will merge to 'next'.

466 +

467

468 * js/trace2-avoid-recursive-errors (2021-11-18) 1 commit

469 - trace2: disable tr2_dst before warning on write errors

470

471 trace2 error code path fix.

472

473 + Will merge to 'next'.

474 +

475

476 * pw/xdiff-classify-record-in-histogram (2021-11-18) 3 commits

477 - xdiff: simplify comparison

@@ -286,23 +480,34 @@ Release tarballs are available at:

480

481 "diff --histogram" optimization.

482

483 + Will merge to 'next'.

484 +

485

486 * rs/mergesort (2021-11-18) 1 commit

487 - mergesort: avoid left shift overflow

488

293 - Bitop fix for 32-bit boxes.

489 + Bitop fix for platforms whose "long" is 32-bit.

490 +

491 + Will merge to 'next'.

492

493

494 * xw/am-empty (2021-11-22) 2 commits

495 - am: support --empty=<option> to handle empty patches

496 - doc: git-format-patch: describe the option --always

497

498 + "git am" learns "--empty=(die|drop|keep)" option to tweak what is

499 + done to a piece of e-mail without a patch in it.

500 +

501 + Will merge to 'next'.

502 +

503

504 * hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit

505 - ci(check-whitespace): update stale file top comments

506

507 Comment fix.

508

509 + Will merge to 'next'.

510 +

511

512 * jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit

513 - fetch-pack: ignore SIGPIPE when writing to index-pack

@@ -345,6 +550,8 @@ Release tarballs are available at:

550 to increase our chances to run the post-receive hook after it

551 happens.

552

553 + Will merge to 'next'?

554 +

555

556 * ab/parse-options-cleanup (2021-11-10) 1 commit

557 - parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()

@@ -376,13 +583,17 @@ Release tarballs are available at:

583 Weather balloon to break people with compilers that do not support

584 C99.

585

586 + Expecting a reroll.

587 +

588

589 * jc/c99-var-decl-in-for-loop (2021-11-22) 1 commit

590 - revision: use C99 declaration of variable in for() loop

591

383 - Weather balloon to break comiplers that do not grok variable

592 + Weather balloon to break compilers that do not grok variable

593 declaration in the for() loop.

594

595 + Will merge to 'next'?

596 +

597

598 * tl/midx-docfix (2021-11-18) 1 commit

599 - midx: fix a formatting issue in "multi-pack-index.txt"

@@ -530,34 +741,6 @@ Release tarballs are available at:

741 Will merge to 'next'.

742

743

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

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

535 - + unsetenv(3) returns int, not void

536 -

537 - The compatibility implementation for unsetenv(3) were written to

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

539 - changed to return an integer to match the more modern era.

540 -

541 - Will merge to 'master'.

542 -

543 -

544 -* mc/clean-smudge-with-llp64 (2021-11-03) 8 commits

545 - (merged to 'next' on 2021-11-03 at fe5160a170)

546 - + clean/smudge: allow clean filters to process extremely large files

547 - + odb: guard against data loss checking out a huge file

548 - + git-compat-util: introduce more size_t helpers

549 - + odb: teach read_blob_entry to use size_t

550 - + t1051: introduce a smudge filter test for extremely large files

551 - + test-lib: add prerequisite for 64-bit platforms

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

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

554 -

555 - The clean/smudge conversion code path has been prepared to better

556 - work on platforms where ulong is narrower than size_t.

557 -

558 - Will merge to 'master'.

559 -

560 -

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

745 - diff --color-moved: intern strings

746 - diff: use designated initializers for emitted_diff_symbol

@@ -578,6 +761,8 @@ Release tarballs are available at:

761 Long-overdue correctness and performance update to "diff

762 --color-moved" feature.

763

764 + Will merge to 'next'.

765 +

766

767 * ab/generate-command-list (2021-11-05) 10 commits

768 - generate-cmdlist.sh: don't parse command-list.txt thrice

@@ -593,48 +778,7 @@ Release tarballs are available at:

778

779 Build optimization.

780

596 -

597 -* ab/sh-retire-helper-functions (2021-10-21) 6 commits

598 - (merged to 'next' on 2021-11-03 at 4b49d9f4be)

599 - + git-sh-setup: remove "sane_grep", it's not needed anymore

600 - + git-sh-setup: remove unused sane_egrep() function

601 - + git-instaweb: unconditionally assume that gitweb is mod_perl capable

602 - + Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)

603 - + Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)

604 - + Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)

605 - (this branch is used by ab/make-dependency.)

606 -

607 - Make a few helper functions unused and then lose them.

608 -

609 - Will merge to 'master'.

610 -

611 -

612 -* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits

613 - (merged to 'next' on 2021-10-29 at 1a01b886e5)

614 - + status: print stash info with --porcelain=v2 --show-stash

615 - + status: count stash entries in separate function

616 -

617 - Allow "git status --porcelain=v2" to show the number of stash

618 - entries with --show-stash like the normal output does.

619 -

620 - Will merge to 'master'.

621 -

622 -

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

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

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

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

627 - + midx.c: write MIDX filenames to strbuf

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

629 - + builtin/repack.c: avoid leaking child arguments

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

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

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

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

634 -

635 - Leakfix.

636 -

637 - Will merge to 'master'.

781 + Will merge to 'next'.

782

783

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

@@ -688,16 +832,6 @@ Release tarballs are available at:

832 Will merge to 'next'.

833

834

691 -* jk/loosen-urlmatch (2021-10-12) 1 commit

692 - (merged to 'next' on 2021-10-25 at f66ca39ebe)

693 - + urlmatch: add underscore to URL_HOST_CHARS

694 -

695 - Treat "_" as any other URL-valid characters in an URL when matching

696 - the per-URL configuration variable names.

697 -

698 - Will merge to 'master'.

699 -

700 -

835 * ab/config-based-hooks-2 (2021-11-24) 18 commits

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

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

@@ -721,18 +855,6 @@ Release tarballs are available at:

855 More "config-based hooks".

856

857

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

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

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

727 - (merged to 'next' on 2021-10-25 at 68b88e35c4)

728 - + stash: implement '--staged' option for 'push' and 'save'

729 -

730 - "git stash" learned the "--staged" option to stash away what has

731 - been added to the index (and nothing else).

732 -

733 - Will merge to 'master'.

734 -

735 -

858 * vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits

859 - sparse-index: update do_read_index to ensure correct sparsity

860 - sparse-index: add ensure_correct_sparsity function

@@ -746,29 +868,6 @@ Release tarballs are available at:

868 Will merge to 'next'.

869

870

749 -* jc/fix-ref-sorting-parse (2021-10-20) 2 commits

750 - (merged to 'next' on 2021-10-29 at e3ec6e8e77)

751 - + for-each-ref: delay parsing of --sort=<atom> options

752 - + Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse

753 -

754 - Things like "git -c branch.sort=bogus branch new HEAD", i.e. the

755 - operation modes of the "git branch" command that do not need the

756 - sort key information, no longer errors out by seeing a bogus sort

757 - key.

758 -

759 - Will merge to 'master'.

760 -

761 -

762 -* jc/tutorial-format-patch-base (2021-10-23) 1 commit

763 - (merged to 'next' on 2021-10-29 at 67ff1a5a77)

764 - + MyFirstContribution: teach to use "format-patch --base=auto"

765 -

766 - Teach and encourage first-time contributors to this project to

767 - state the base commit when they submit their topic.

768 -

769 - Will merge to 'master'.

770 -

771 -

871 * js/branch-track-inherit (2021-11-18) 1 commit

872 - branch: add flags and config to inherit tracking

873

@@ -811,7 +910,7 @@ Release tarballs are available at:

910 Built-in fsmonitor (part 2).

911

912

814 -* ld/sparse-diff-blame (2021-10-27) 3 commits

913 +* ld/sparse-diff-blame (2021-11-29) 3 commits

914 - blame: enable and test the sparse index

915 - diff: enable and test the sparse index

916 - Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame

@@ -846,12 +945,10 @@ Release tarballs are available at:

945

946

947 * ns/tmp-objdir (2021-10-27) 4 commits

849 - (merged to 'next' on 2021-10-27 at 001a18c0e1)

850 - + fixup! tmp-objdir: new API for creating temporary writable databases

851 - + fixup! tmp-objdir: new API for creating temporary writable databases

852 - (merged to 'next' on 2021-10-23 at 358d376f61)

853 - + tmp-objdir: disable ref updates when replacing the primary odb

854 - + tmp-objdir: new API for creating temporary writable databases

948 + - fixup! tmp-objdir: new API for creating temporary writable databases

949 + - fixup! tmp-objdir: new API for creating temporary writable databases

950 + - tmp-objdir: disable ref updates when replacing the primary odb

951 + - tmp-objdir: new API for creating temporary writable databases

952 (this branch is used by ns/batched-fsync and ns/remerge-diff.)

953

954 New interface into the tmp-objdir API to help in-core use of the

@@ -861,7 +958,7 @@ Release tarballs are available at:

958 cf. <xmqqo87auqda.fsf@gitster.g>

959

960

864 -* vd/sparse-reset (2021-10-27) 8 commits

961 +* vd/sparse-reset (2021-11-29) 8 commits

962 - unpack-trees: improve performance of next_cache_entry

963 - reset: make --mixed sparse-aware

964 - reset: make sparse-aware (except --mixed)

@@ -911,29 +1008,16 @@ Release tarballs are available at:

1008 the superproject it is bound to (RFC).

1009

1010

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

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

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

917 - + send-email: programmatically generate bash completions

918 -

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

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

921 -

922 - Will merge to 'master'.

923 -

924 -

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

926 - (merged to 'next' on 2021-10-27 at eb2a3afdd1)

927 - + Merge branch 'ns/tmp-objdir' into ns/batched-fsync

928 - (merged to 'next' on 2021-10-25 at e45c907d41)

929 - + core.fsyncobjectfiles: performance tests for add and stash

930 - + core.fsyncobjectfiles: tests for batch mode

931 - + unpack-objects: use the bulk-checkin infrastructure

932 - + update-index: use the bulk-checkin infrastructure

933 - + core.fsyncobjectfiles: add windows support for batch mode

934 - + core.fsyncobjectfiles: batched disk flushes

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

936 - + Merge branch 'ns/tmp-objdir' into ns/batched-fsync

1012 + - Merge branch 'ns/tmp-objdir' into ns/batched-fsync

1013 + - core.fsyncobjectfiles: performance tests for add and stash

1014 + - core.fsyncobjectfiles: tests for batch mode

1015 + - unpack-objects: use the bulk-checkin infrastructure

1016 + - update-index: use the bulk-checkin infrastructure

1017 + - core.fsyncobjectfiles: add windows support for batch mode

1018 + - core.fsyncobjectfiles: batched disk flushes

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

1020 + - Merge branch 'ns/tmp-objdir' into ns/batched-fsync

1021 (this branch uses ns/tmp-objdir.)

1022

1023 The "core.fsyncobjectfiles" configuration variable can now be set

@@ -981,35 +1065,6 @@ Release tarballs are available at:

1065 used as an in-blob placeholder for keyword expansion.

1066

1067

984 -* ab/refs-errno-cleanup (2021-10-16) 21 commits

985 - (merged to 'next' on 2021-10-29 at 3f57147176)

986 - + refs API: post-migration API renaming [2/2]

987 - + refs API: post-migration API renaming [1/2]

988 - + refs API: don't expose "errno" in run_transaction_hook()

989 - + refs API: make expand_ref() & repo_dwim_log() not set errno

990 - + refs API: make resolve_ref_unsafe() not set errno

991 - + refs API: make refs_ref_exists() not set errno

992 - + refs API: make refs_resolve_refdup() not set errno

993 - + refs tests: ignore ignore errno in test-ref-store helper

994 - + refs API: ignore errno in worktree.c's find_shared_symref()

995 - + refs API: ignore errno in worktree.c's add_head_info()

996 - + refs API: make files_copy_or_rename_ref() et al not set errno

997 - + refs API: make loose_fill_ref_dir() not set errno

998 - + refs API: make resolve_gitlink_ref() not set errno

999 - + refs API: remove refs_read_ref_full() wrapper

1000 - + refs/files: remove "name exist?" check in lock_ref_oid_basic()

1001 - + reflog tests: add --updateref tests

1002 - + refs API: make refs_rename_ref_available() static

1003 - + refs API: make parse_loose_ref_contents() not set errno

1004 - + refs API: make refs_read_raw_ref() not set errno

1005 - + refs API: add a version of refs_resolve_ref_unsafe() with "errno"

1006 - + branch tests: test for errno propagating on failing read

1007 -

1008 - The "remainder" of hn/refs-errno-cleanup topic.

1009 -

1010 - Will merge to 'master'.

1011 -

1012 -

1068 * ab/only-single-progress-at-once (2021-11-03) 8 commits

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

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

What's cooking (2021/11 #07)