29b2935c5b · matheusbsbs/matheus-bagliano

@@ -1,10 +1,9 @@

1 To: git@vger.kernel.org

2 -Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2021, #04; Mon, 19)

2 +Subject: What's cooking in git.git (Jul 2021, #05; Wed, 21)

3 X-master-at: daab8a564f8bbac55f70f8bf86c070e001a9b006

5 -X-next-at: 1bb01aad6fdafaac7a11bed18a67384f28ab735b

4 +X-next-at: 7e0b7c1f0c169fbf424a182c53f9a5a516fe85f4

5

7 -What's cooking in git.git (Jul 2021, #04; Mon, 19)

6 +What's cooking in git.git (Jul 2021, #05; Wed, 21)

7 --------------------------------------------------

8

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

@@ -47,212 +46,166 @@ Release tarballs are available at:

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

47

48 --------------------------------------------------

50 -[Graduated to 'master']

51 -

52 -* ab/bundle-updates (2021-07-06) 3 commits

53 - (merged to 'next' on 2021-07-08 at 0c9c54fad7)

54 - + bundle: remove "ref_list" in favor of string-list.c API

55 - + bundle.c: use a temporary variable for OIDs and names

56 - + bundle cmd: stop leaking memory from parse_options_cmd_bundle()

57 -

58 - Code clean-up and leak plugging in "git bundle".

59 -

60 -

61 -* ab/fetch-negotiate-segv-fix (2021-07-08) 3 commits

62 - (merged to 'next' on 2021-07-08 at 30dcd90ea6)

63 - + fetch: fix segfault in --negotiate-only without --negotiation-tip=*

64 - + fetch: document the --negotiate-only option

65 - + send-pack.c: move "no refs in common" abort earlier

66 -

67 - Code recently added to support common ancestry negotiation during

68 - "git push" did not sanity check its arguments carefully enough.

69 -

70 -

71 -* ab/make-delete-on-error (2021-06-29) 1 commit

72 - (merged to 'next' on 2021-07-08 at 787d70d2d6)

73 - + Makefile: add and use the ".DELETE_ON_ERROR" flag

74 -

75 - Use ".DELETE_ON_ERROR" pseudo target to simplify our Makefile.

76 -

77 -

78 -* ab/mktag-tests (2021-06-28) 6 commits

79 - (merged to 'next' on 2021-07-08 at bfd55b0a38)

80 - + mktag tests: test fast-export

81 - + mktag tests: test for-each-ref

82 - + mktag tests: test update-ref and reachable fsck

83 - + mktag tests: test hash-object --literally and unreachable fsck

84 - + mktag tests: invert --no-strict test

85 - + mktag tests: parse out options in helper

86 -

87 - Fill test gaps.

88 -

89 -

90 -* ab/show-branch-tests (2021-06-28) 4 commits

91 - (merged to 'next' on 2021-07-08 at 47f90868cf)

92 - + show-branch tests: add missing tests

93 - + show-branch: don't <COLOR></RESET> for space characters

94 - + show-branch tests: modernize test code

95 - + show-branch tests: rename the one "show-branch" test file

96 -

97 - Fill test gaps.

98 -

99 -

100 -* ab/struct-init (2021-07-01) 5 commits

101 - (merged to 'next' on 2021-07-09 at 8aec33fe39)

102 - + string-list.h users: change to use *_{nodup,dup}()

103 - + string-list.[ch]: add a string_list_init_{nodup,dup}()

104 - + dir.[ch]: replace dir_init() with DIR_INIT

105 - + *.c *_init(): define in terms of corresponding *_INIT macro

106 - + *.h: move some *_INIT to designated initializers

107 -

108 - Code cleanup around struct_type_init() functions.

109 -

110 -

111 -* ar/help-micro-cleanup (2021-07-06) 1 commit

112 - (merged to 'next' on 2021-07-09 at d8e428c6fd)

113 - + help: convert git_cmd to page in one place

114 -

115 - Tiny code clean-up.

49 +[New Topics]

50

51 +* ab/bundle-tests (2021-07-20) 2 commits

52 + - bundle tests: use test_cmp instead of grep

53 + - bundle tests: use ">file" not ": >file"

54

118 -* ar/submodule-helper-include-cleanup (2021-07-06) 1 commit

119 - (merged to 'next' on 2021-07-09 at 7e1d15fb86)

120 - + submodule--helper: remove redundant include

55 + "git bundle" gained more test coverage.

56

122 - Code clean-up.

57 + Will merge to 'next'.

58

59

125 -* dd/test-stdout-count-lines (2021-07-06) 3 commits

126 - (merged to 'next' on 2021-07-09 at 19200fa2e0)

127 - + t6402: preserve git exit status code

128 - + t6400: preserve git ls-files exit status code

129 - + test-lib-functions: introduce test_stdout_line_count

60 +* es/config-based-hooks (2021-07-20) 9 commits

61 + - hook: implement hookcmd.<name>.skip

62 + - hook: teach 'hookcmd' config to alias hook scripts

63 + - hook: allow out-of-repo 'git hook' invocations

64 + - hook: include hooks from the config

65 + - hook: allow running non-native hooks

66 + - hook: treat hookdir hook specially

67 + - hook: introduce "git hook list"

68 + - hook: allow parallel hook execution

69 + - hook: run a list of hooks instead

70 + (this branch uses ab/config-based-hooks-base.)

71

131 - Tiny test clean-up.

72 + The "hooks defined via the configuration variables" topic.

73

74

134 -* ds/gender-neutral-doc (2021-06-16) 3 commits

135 - (merged to 'next' on 2021-07-09 at 57bb445576)

136 - + *: fix typos

137 - + comments: avoid using the gender of our users

138 - + doc: avoid using the gender of other people

139 - (this branch is used by ds/gender-neutral-doc-guidelines.)

75 +* fs/ssh-signing (2021-07-20) 10 commits

76 + - SQUASH???

77 + - ssh signing: add documentation

78 + - ssh signing: add more tests for logs, tags & push certs

79 + - ssh signing: duplicate t7510 tests for commits

80 + - ssh signing: add test prereqs

81 + - ssh signing: parse ssh-keygen output and verify signatures

82 + - ssh signing: provide a textual representation of the signing key

83 + - ssh signing: retrieve a default key from ssh-agent

84 + - ssh signing: add ssh signature format and signing using ssh keys

85 + - ssh signing: preliminary refactoring and clean-up

86

141 - Update the documentation not to assume users are of certain gender

142 - and adds to guidelines to do so.

87 + Use ssh public crypto for object and push-cert signing.

88

89 + Seems to break tests when merged to 'seen'.

90

145 -* en/merge-dir-rename-corner-case-fix (2021-06-30) 3 commits

146 - (merged to 'next' on 2021-07-08 at cf7087576e)

147 - + merge-recursive: handle rename-to-self case

148 - + merge-ort: ensure we consult df_conflict and path_conflicts

149 - + t6423: test directory renames causing rename-to-self

91

151 - The merge code had funny interactions between content based rename

152 - detection and directory rename detection.

92 +* hn/refs-debug-empty-prefix (2021-07-19) 1 commit

93 + (merged to 'next' on 2021-07-20 at 2772d3efb2)

94 + + refs/debug: quote prefix

95

96 + Debugging aid.

97

155 -* en/ort-perf-batch-12 (2021-06-09) 4 commits

156 - (merged to 'next' on 2021-07-08 at 4807694598)

157 - + merge-ort: miscellaneous touch-ups

158 - + Fix various issues found in comments

159 - + diffcore-rename: avoid unnecessary strdup'ing in break_idx

160 - + merge-ort: replace string_list_df_name_compare with faster alternative

98 + Will merge to 'master'.

99

162 - More fix-ups and optimization to "merge -sort".

100

101 +* pb/submodule-recurse-doc (2021-07-20) 1 commit

102 + - doc: clarify description of 'submodule.recurse'

103

165 -* en/ort-perf-batch-13 (2021-06-28) 5 commits

166 - (merged to 'next' on 2021-07-08 at 39aad121d3)

167 - + merge-ort: add prefetching for content merges

168 - + diffcore-rename: use a different prefetch for basename comparisons

169 - + diffcore-rename: allow different missing_object_cb functions

170 - + t6421: add tests checking for excessive object downloads during merge

171 - + promisor-remote: output trace2 statistics for number of objects fetched

104 + Doc update.

105

173 - Performance tweaks of "git merge -sort" around lazy fetching of objects.

106 + Will merge to 'next'.

107

108

176 -* ew/mmap-failures (2021-06-29) 1 commit

177 - (merged to 'next' on 2021-07-08 at e0e19d5d26)

178 - + xmmap: inform Linux users of tuning knobs on ENOMEM

109 +* ps/t0000-output-directory-fix (2021-07-20) 1 commit

110 + (merged to 'next' on 2021-07-20 at 7e0b7c1f0c)

111 + + t0000: fix test if run with TEST_OUTPUT_DIRECTORY

112 + (this branch uses jk/t0000-subtests-fix.)

113

180 - Error message update.

114 + "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has

115 + been corrected.

116

117 + Will merge to 'master'.

118

183 -* hn/refs-iterator-peel-returns-boolean (2021-05-20) 1 commit

184 - (merged to 'next' on 2021-07-08 at b9b35881ba)

185 - + refs: make explicit that ref_iterator_peel returns boolean

186 - (this branch is used by hn/reftable.)

119

188 - Tiny API tweak.

120 +* tb/bitmap-type-filter-comment-fix (2021-07-20) 1 commit

121 + - pack-bitmap: clarify comment in filter_bitmap_exclude_type()

122

123 + In-code comment update.

124

191 -* hn/refs-test-cleanup (2021-07-06) 2 commits

192 - (merged to 'next' on 2021-07-09 at ae08de6afc)

193 - + t7509: avoid direct file access for writing CHERRY_PICK_HEAD

194 - + t1415: avoid direct filesystem access for writing refs

125 + Will merge to 'next'.

126

196 - Test clean-up.

127

128 +* tb/reverse-midx (2021-07-19) 1 commit

129 + (merged to 'next' on 2021-07-20 at 995cb54b5b)

130 + + multi-pack-index: fix potential segfault without sub-command

131

199 -* js/config-mak-windows-pcre-fix (2021-06-28) 1 commit

200 - (merged to 'next' on 2021-07-08 at fe457da682)

201 - + config.mak.uname: PCRE1 cleanup

132 + The code that gives an error message in "git multi-pack-index" when

133 + no subcommand is given tried to print a NULL pointer as a strong,

134 + which has been corrected.

135

203 - Whitespace fix.

136 + Will merge to 'master'.

137

138

206 -* js/gfw-system-config-loc-fix (2021-06-28) 3 commits

207 - (merged to 'next' on 2021-07-08 at 91a090ab50)

208 - + config: normalize the path of the system gitconfig

209 - + cmake(windows): set correct path to the system Git config

210 - + mingw: move Git for Windows' system config where users expect it

139 +* hn/refs-test-cleanup (2021-07-19) 5 commits

140 + - t2402: use ref-store test helper to create broken symlink

141 + - t3320: use git-symbolic-ref rather than filesystem access

142 + - t6120: use git-update-ref rather than filesystem access

143 + - t1503: mark symlink test as REFFILES

144 + - t6050: use git-update-ref rather than filesystem access

145

212 - Update the location of system-side configuration file on Windows.

146 + A handful of tests that assumed implementation details of files

147 + backend for refs have been cleaned up.

148

149 + Will merge to 'next'.

150

215 -* jt/partial-clone-submodule-1 (2021-06-28) 5 commits

216 - (merged to 'next' on 2021-07-09 at 2bc8c2c4dd)

217 - + promisor-remote: teach lazy-fetch in any repo

218 - + run-command: refactor subprocess env preparation

219 - + submodule: refrain from filtering GIT_CONFIG_COUNT

220 - + promisor-remote: support per-repository config

221 - + repository: move global r_f_p_c to repo struct

151 +--------------------------------------------------

152 +[Stalled]

153

223 - Prepare the internals for lazily fetching objects in submodules

224 - from their promisor remotes.

154 +* ao/p4-avoid-decoding (2021-04-12) 2 commits

155 + - git-p4: do not decode data from perforce by default

156 + - git-p4: avoid decoding more data from perforce

157

158 + "git p4" in Python-2 days used to accept a lot more kinds of data

159 + from Perforce server as uninterrupted byte sequence, but after

160 + switching to Python-3, too many things are expected to be in UTF-8,

161 + which broke traditional use cases.

162

227 -* ks/submodule-cleanup (2021-06-28) 1 commit

228 - (merged to 'next' on 2021-07-08 at 03ba93067f)

229 - + submodule: remove unnecessary `prefix` based option logic

163 + Waiting for reviews.

164

231 - Code cleanup.

165

166 +* tv/p4-fallback-encoding (2021-04-30) 1 commit

167 + - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset

168

234 -* rs/khash-alloc-cleanup (2021-07-06) 1 commit

235 - (merged to 'next' on 2021-07-09 at a01d1bb8c9)

236 - + khash: clarify that allocations never fail

169 + "git p4" learns the fallbackEncoding configuration variable to

170 + safely accept changeset descriptions that aren't written in UTF-8.

171

238 - Code clean-up.

172 + Waiting for reviews.

173

174 +--------------------------------------------------

175 +[Cooking]

176

241 -* tb/midx-use-checksum (2021-06-28) 4 commits

242 - (merged to 'next' on 2021-07-08 at bbaac9c721)

243 - + midx: report checksum mismatches during 'verify'

244 - + midx: don't reuse corrupt MIDXs when writing

245 - + commit-graph: rewrite to use checksum_valid()

246 - + csum-file: introduce checksum_valid()

177 +* hn/reftable (2021-07-20) 26 commits

178 + - t7004: avoid direct filesystem access

179 + - t1404: annotate test cases with REFFILES

180 + - t1401,t2011: parameterize HEAD.lock for REFFILES

181 + - t1301: document what needs to be done for reftable

182 + - Add "test-tool dump-reftable" command.

183 + - git-prompt: prepare for reftable refs backend

184 + - refs: RFC: Reftable support for git-core

185 + - reftable: add dump utility

186 + - reftable: implement stack, a mutable database of reftable files.

187 + - reftable: implement refname validation

188 + - reftable: add merged table view

189 + - reftable: add a heap-based priority queue for reftable records

190 + - reftable: reftable file level tests

191 + - reftable: read reftable files

192 + - reftable: generic interface to tables

193 + - reftable: write reftable files

194 + - reftable: a generic binary tree implementation

195 + - reftable: reading/writing blocks

196 + - Provide zlib's uncompress2 from compat/zlib-compat.c

197 + - reftable: (de)serialization for the polymorphic record type.

198 + - reftable: add blocksource, an abstraction for random access reads

199 + - reftable: utility functions

200 + - reftable: add error related functionality

201 + - reftable: RFC: add LICENSE

202 + - init-db: set the_repository->hash_algo early on

203 + - hash.h: provide constants for the hash IDs

204

248 - When rebuilding the multi-pack index file reusing an existing one,

249 - we used to blindly trust the existing file and ended up carrying

250 - corrupted data into the updated file, which has been corrected.

205 + The "reftable" backend for the refs API.

206

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

253 -[New Topics]

207

255 -* jk/config-env-doc (2021-07-14) 3 commits

208 +* jk/config-env-doc (2021-07-20) 3 commits

209 - doc/git-config: simplify "override" advice for FILES section

210 - doc/git-config: clarify GIT_CONFIG environment variable

211 - doc/git-config: explain --file instead of referring to GIT_CONFIG

@@ -272,23 +225,26 @@ Release tarballs are available at:

225

226

227 * js/ci-make-sparse (2021-07-14) 1 commit

275 - - ci: run `make sparse` as part of the GitHub workflow

228 + (merged to 'next' on 2021-07-20 at 99f518bdef)

229 + + ci: run `make sparse` as part of the GitHub workflow

230

231 The CI gained a new job to run "make sparse" check.

232

279 - Will merge to 'next'.

233 + Will merge to 'master'.

234

235

236 * pb/dont-complete-aliased-options (2021-07-16) 1 commit

283 - - parse-options: don't complete option aliases by default

237 + (merged to 'next' on 2021-07-20 at bbc531c710)

238 + + parse-options: don't complete option aliases by default

239

240 The completion support used to offer alternate spelling of options

241 that exist only for compatibility, which has been corrected.

242

288 - Will merge to 'next'.

243 + Will merge to 'master'.

244

245

291 -* ab/refs-files-cleanup (2021-07-19) 11 commits

246 +* ab/refs-files-cleanup (2021-07-20) 12 commits

247 + - refs/files: remove unused "errno != ENOTDIR" condition

248 - refs/files: remove unused "errno == EISDIR" code

249 - refs/files: remove unused "oid" in lock_ref_oid_basic()

250 - reflog expire: don't lock reflogs using previously seen OID

@@ -304,19 +260,18 @@ Release tarballs are available at:

260

261 Patches are mostly good, but needs typofixes etc.

262

307 - Expecting a hopefully final reroll.

263 + Will merge to 'next'.

264

265

310 -* en/pull-conflicting-options (2021-07-19) 9 commits

266 +* en/pull-conflicting-options (2021-07-20) 8 commits

267 - pull: fix handling of multiple heads

268 - pull: update docs & code for option compatibility with rebasing

269 - pull: abort by default when fast-forwarding is not possible

270 - pull: make --rebase and --no-rebase override pull.ff=only

315 - - pull: ensure --rebase overrides ability to ff

271 - pull: since --ff-only overrides, handle it first

272 - pull: abort if --ff-only is given and fast-forwarding is impossible

273 - t7601: add tests of interactions with multiple merge heads and config

319 - - t7601: add relative precedence tests for merge and rebase flags/options

274 + - t7601: test interaction of merge/rebase/fast-forward flags and options

275

276 "git pull" had various corner cases that were not well thought out

277 around its --rebase backend, e.g. "git pull --ff-only" did not stop

@@ -325,69 +280,14 @@ Release tarballs are available at:

280

281

282 * jk/t0000-subtests-fix (2021-07-19) 1 commit

328 - - t0000: clear GIT_SKIP_TESTS before running sub-tests

283 + (merged to 'next' on 2021-07-20 at 81412e1684)

284 + + t0000: clear GIT_SKIP_TESTS before running sub-tests

285 + (this branch is used by ps/t0000-output-directory-fix.)

286

287 Test fix.

288

332 - Will merge to 'next'.

333 -

334 ---------------------------------------------------

335 -[Stalled]

336 -

337 -* hn/reftable (2021-05-20) 27 commits

338 - . t1404: annotate test cases with REFFILES

339 - . t1401,t2011: parameterize HEAD.lock for REFTABLE

340 - . t1301: document what needs to be done for REFTABLE

341 - . Add "test-tool dump-reftable" command.

342 - . git-prompt: prepare for reftable refs backend

343 - . Reftable support for git-core

344 - . reftable: add dump utility

345 - . reftable: implement stack, a mutable database of reftable files.

346 - . reftable: implement refname validation

347 - . reftable: add merged table view

348 - . reftable: add a heap-based priority queue for reftable records

349 - . reftable: reftable file level tests

350 - . reftable: read reftable files

351 - . reftable: generic interface to tables

352 - . reftable: write reftable files

353 - . reftable: a generic binary tree implementation

354 - . reftable: reading/writing blocks

355 - . Provide zlib's uncompress2 from compat/zlib-compat.c

356 - . reftable: (de)serialization for the polymorphic record type.

357 - . reftable: add blocksource, an abstraction for random access reads

358 - . reftable: utility functions

359 - . reftable: add error related functionality

360 - . reftable: add LICENSE

361 - . init-db: set the_repository->hash_algo early on

362 - . hash.h: provide constants for the hash IDs

363 - . refs/debug: trace into reflog expiry too

364 - . refs: document reflog_expire_fn's flag argument

365 -

366 - The "reftable" backend for the refs API.

367 -

368 -

369 -* ao/p4-avoid-decoding (2021-04-12) 2 commits

370 - - git-p4: do not decode data from perforce by default

371 - - git-p4: avoid decoding more data from perforce

372 -

373 - "git p4" in Python-2 days used to accept a lot more kinds of data

374 - from Perforce server as uninterrupted byte sequence, but after

375 - switching to Python-3, too many things are expected to be in UTF-8,

376 - which broke traditional use cases.

377 -

378 - Waiting for reviews.

379 -

380 -

381 -* tv/p4-fallback-encoding (2021-04-30) 1 commit

382 - - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset

383 -

384 - "git p4" learns the fallbackEncoding configuration variable to

385 - safely accept changeset descriptions that aren't written in UTF-8.

289 + Will merge to 'master'.

290

387 - Waiting for reviews.

388 -

389 ---------------------------------------------------

390 -[Cooking]

291

292 * dl/packet-read-response-end-fix (2021-07-09) 1 commit

293 (merged to 'next' on 2021-07-16 at 6a7734b6b5)

@@ -410,35 +310,39 @@ Release tarballs are available at:

310

311

312 * ab/attribute-format (2021-07-13) 5 commits

413 - - advice.h: add missing __attribute__((format)) & fix usage

414 - - *.h: add a few missing __attribute__((format))

415 - - *.c static functions: add missing __attribute__((format))

416 - - sequencer.c: move static function to avoid forward decl

417 - - *.c static functions: don't forward-declare __attribute__

313 + (merged to 'next' on 2021-07-20 at 44e5606a6e)

314 + + advice.h: add missing __attribute__((format)) & fix usage

315 + + *.h: add a few missing __attribute__((format))

316 + + *.c static functions: add missing __attribute__((format))

317 + + sequencer.c: move static function to avoid forward decl

318 + + *.c static functions: don't forward-declare __attribute__

319

320 Many "printf"-like helper functions we have have been annotated

321 with __attribute__() to catch placeholder/parameter mismatches.

322

422 - Will merge to 'next'.

323 + Will merge to 'master'.

324

325

326 * dl/diff-merge-base (2021-07-12) 1 commit

426 - - git-diff: fix missing --merge-base docs

327 + (merged to 'next' on 2021-07-20 at 013d013bcf)

328 + + git-diff: fix missing --merge-base docs

329

330 "git diff --merge-base" documentation has been updated.

331

430 - Will merge to 'next'.

332 + Will merge to 'master'.

333

334

335 * en/rename-limits-doc (2021-07-15) 4 commits

434 - - rename: bump limit defaults yet again

435 - - diffcore-rename: treat a rename_limit of 0 as unlimited

436 - - doc: clarify documentation for rename/copy limits

437 - - diff: correct warning message when renameLimit exceeded

336 + (merged to 'next' on 2021-07-20 at a89253d530)

337 + + rename: bump limit defaults yet again

338 + + diffcore-rename: treat a rename_limit of 0 as unlimited

339 + + doc: clarify documentation for rename/copy limits

340 + + diff: correct warning message when renameLimit exceeded

341

439 - Update documentation on "git diff -l<n>" and diff.renameLimit.

342 + Documentation on "git diff -l<n>" and diff.renameLimit have been

343 + updated, and the defaults for these limits have been raised.

344

441 - Will merge to 'next'.

345 + Will merge to 'master'.

346

347

348 * jk/typofix (2021-07-13) 1 commit

@@ -479,12 +383,13 @@ Release tarballs are available at:

383

384

385 * ab/pkt-line-tests (2021-07-19) 1 commit

482 - - test-lib-functions: use test-tool for [de]packetize()

386 + (merged to 'next' on 2021-07-20 at 8e5e53450c)

387 + + test-lib-functions: use test-tool for [de]packetize()

388

484 - Update tests to cover a bit more protocol bits and unify two

485 - similar test helpers into one.

389 + Tests that cover protocol bits have been updated and helpers

390 + used there have been consolidated.

391

487 - Will merge to 'next'.

392 + Will merge to 'master'.

393

394

395 * bc/inactive-submodules (2021-07-02) 1 commit

@@ -497,7 +402,7 @@ Release tarballs are available at:

402 cf. <bf1893ee-6973-d8b2-659e-bb239a0a9ae2@gmail.com>

403

404

500 -* en/ort-perf-batch-14 (2021-07-13) 7 commits

405 +* en/ort-perf-batch-14 (2021-07-20) 7 commits

406 - merge-ort: restart merge with cached renames to reduce process entry cost

407 - merge-ort: avoid recursing into directories when we don't need to

408 - merge-ort: defer recursing into directories when merge base is matched

@@ -508,7 +413,7 @@ Release tarballs are available at:

413

414 Further optimization on "merge -sort" backend.

415

511 - Reviews?

416 + Will merge to 'next'.

417

418

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

@@ -518,6 +423,7 @@ Release tarballs are available at:

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

424

425 Expecting a reroll.

426 + cf. <xmqqsg0ri5mq.fsf@gitster.g>

427

428

429 * ps/perf-with-separate-output-directory (2021-07-02) 1 commit

@@ -540,7 +446,7 @@ Release tarballs are available at:

446 Will merge to 'master'.

447

448

543 -* ab/bundle-doc (2021-07-02) 3 commits

449 +* ab/bundle-doc (2021-07-20) 3 commits

450 - bundle doc: elaborate on rev<->ref restriction

451 - bundle doc: elaborate on object prerequisites

452 - bundle doc: rewrite the "DESCRIPTION" section

@@ -562,7 +468,9 @@ Release tarballs are available at:

468 cf. <YND3h2l10PlnSNGJ@nand.local>

469

470

565 -* ds/commit-and-checkout-with-sparse-index (2021-07-14) 5 commits

471 +* ds/commit-and-checkout-with-sparse-index (2021-07-20) 7 commits

472 + - unpack-trees: resolve sparse-directory/file conflicts

473 + - t1092: document bad 'git checkout' behavior

474 - checkout: stop expanding sparse indexes

475 - sparse-index: recompute cache-tree

476 - commit: integrate with sparse-index

@@ -586,7 +494,7 @@ Release tarballs are available at:

494

495 Optimization for repositories with many alternate object store.

496

589 - Will merge to 'next'?

497 + Will merge to 'master'.

498

499

500 * jk/log-decorate-optim (2021-07-14) 7 commits

@@ -681,28 +589,29 @@ Release tarballs are available at:

589

590

591 * ds/status-with-sparse-index (2021-07-14) 16 commits

684 - - t1092: document bad sparse-checkout behavior

685 - - fsmonitor: integrate with sparse index

686 - - wt-status: expand added sparse directory entries

687 - - status: use sparse-index throughout

688 - - status: skip sparse-checkout percentage with sparse-index

689 - - diff-lib: handle index diffs with sparse dirs

690 - - dir.c: accept a directory as part of cone-mode patterns

691 - - unpack-trees: unpack sparse directory entries

692 - - unpack-trees: rename unpack_nondirectories()

693 - - unpack-trees: compare sparse directories correctly

694 - - unpack-trees: preserve cache_bottom

695 - - t1092: add tests for status/add and sparse files

696 - - t1092: expand repository data shape

697 - - t1092: replace incorrect 'echo' with 'cat'

698 - - sparse-index: include EXTENDED flag when expanding

699 - - sparse-index: skip indexes with unmerged entries

592 + (merged to 'next' on 2021-07-20 at 1558d36c0f)

593 + + t1092: document bad sparse-checkout behavior

594 + + fsmonitor: integrate with sparse index

595 + + wt-status: expand added sparse directory entries

596 + + status: use sparse-index throughout

597 + + status: skip sparse-checkout percentage with sparse-index

598 + + diff-lib: handle index diffs with sparse dirs

599 + + dir.c: accept a directory as part of cone-mode patterns

600 + + unpack-trees: unpack sparse directory entries

601 + + unpack-trees: rename unpack_nondirectories()

602 + + unpack-trees: compare sparse directories correctly

603 + + unpack-trees: preserve cache_bottom

604 + + t1092: add tests for status/add and sparse files

605 + + t1092: expand repository data shape

606 + + t1092: replace incorrect 'echo' with 'cat'

607 + + sparse-index: include EXTENDED flag when expanding

608 + + sparse-index: skip indexes with unmerged entries

609 (this branch is used by ds/commit-and-checkout-with-sparse-index.)

610

611 "git status" codepath learned to work with sparsely populated index

612 without hydrating it fully.

613

705 - Will merge to 'next'.

614 + Will merge to 'master'.

615

616

617 * ab/config-based-hooks-base (2021-06-29) 33 commits

@@ -739,6 +648,7 @@ Release tarballs are available at:

648 - Makefile: remove an out-of-date comment

649 - Makefile: stop hardcoding {command,config}-list.h

650 - Makefile: mark "check" target as .PHONY

651 + (this branch is used by es/config-based-hooks.)

652

653 Restructuring of (a subset of) Emily's config-based-hooks series,

654 to demonstrate that a series can be presented as a more logical and

@@ -778,6 +688,7 @@ Release tarballs are available at:

688

689 Expecting a reroll.

690 cf. <cover-0.8-00000000000-20210628T191634Z-avarab@gmail.com>

691 + cf. <87tul24iw2.fsf@evledraar.gmail.com>

692

693

694 * es/superproject-aware-submodules (2021-06-16) 5 commits

@@ -803,8 +714,9 @@ Release tarballs are available at:

714 cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>

715

716

806 -* pw/diff-color-moved-fix (2021-06-15) 10 commits

717 +* pw/diff-color-moved-fix (2021-07-20) 12 commits

718 - diff --color-moved: intern strings

719 + - diff: use designated initializers for emitted_diff_symbol

720 - diff --color-moved-ws=allow-indentation-change: improve hash lookups

721 - diff --color-moved: stop clearing potential moved blocks

722 - diff --color-moved: shrink potential moved blocks as we go

@@ -812,17 +724,15 @@ Release tarballs are available at:

724 - diff --color-moved: call comparison function directly

725 - diff --color-moved-ws=allow-indentation-change: simplify and optimize

726 - diff: simplify allow-indentation-change delta calculation

815 - - diff --color-moved: avoid false short line matches and bad zebra coloring

727 + - diff --color-moved: avoid false short line matches and bad zerba coloring

728 - diff --color-moved=zebra: fix alternate coloring

729 + - diff --color-moved: add perf tests

730

731 Long-overdue correctness and performance update to "diff

732 --color-moved" feature.

733

821 - Expecting a reroll.

822 - cf. <094f5e5f-d447-8867-a9a7-be5c8827bba6@gmail.com>

823 -

734

825 -* hn/refs-errno-cleanup (2021-07-19) 7 commits

735 +* hn/refs-errno-cleanup (2021-07-20) 7 commits

736 - refs: make errno output explicit for refs_resolve_ref_unsafe

737 - refs: explicitly return failure_errno from parse_loose_ref_contents

738 - refs: add failure_errno to refs_read_raw_ref() signature

@@ -835,7 +745,7 @@ Release tarballs are available at:

745 Futz with the way 'errno' is relied on in the refs API to carry the

746 failure modes up the callchain.

747

838 - Will merge to 'next' once 'ab/refs-files-cleanup' gets cleaned up.

748 + Will merge to 'next'.

749

750

751 * ab/test-tool-cache-cleanup (2021-06-08) 4 commits

@@ -871,11 +781,12 @@ Release tarballs are available at:

781

782

783 * ds/gender-neutral-doc-guidelines (2021-07-16) 1 commit

874 - - CodingGuidelines: recommend gender-neutral description

784 + (merged to 'next' on 2021-07-20 at 06d325e064)

785 + + CodingGuidelines: recommend gender-neutral description

786

876 - Attempt to give a guideline for gender neutral documentation.

787 + A guideline for gender neutral documentation has been added.

788

878 - Will merge to 'next'?

789 + Will merge to 'master'.

790

791

792 * gh/gitweb-branch-sort (2021-06-10) 1 commit

What's cooking (2021/07 #05)