e1632a31a5 · 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 (Sep 2020, #05; Fri, 18)

4 -X-master-at: 385c171a018f2747b329bcfa6be8eda1709e5abd

5 -X-next-at: 8d73e042082d7476596b06e00a6c3d1828fa6b49

3 +Subject: What's cooking in git.git (Sep 2020, #06; Tue, 22)

4 +X-master-at: e1cfff676549cdcd702cbac105468723ef2722f4

5 +X-next-at: 8561365e88e520292a0612ade20fec91b7b4cabd

6

7 -What's cooking in git.git (Sep 2020, #05; Fri, 18)

7 +What's cooking in git.git (Sep 2020, #06; Tue, 22)

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

9

10 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -20,227 +20,180 @@ repositories listed at

20 --------------------------------------------------

21 [Graduated to 'master']

22

23 -* al/t3200-back-on-a-branch (2020-09-08) 1 commit

24 - (merged to 'next' on 2020-09-09 at 833e2fc60c)

25 - + t3200: clean side effect of git checkout --orphan

26 -

27 - Test fix.

28 -

29 -

30 -* ea/blame-use-oideq (2020-09-08) 1 commit

31 - (merged to 'next' on 2020-09-09 at babefe4727)

32 - + blame.c: replace instance of !oidcmp for oideq

33 -

34 - Code cleanup.

35 -

36 -

37 -* es/wt-add-detach (2020-09-06) 3 commits

38 - (merged to 'next' on 2020-09-10 at abd83f90e7)

39 - + git-worktree.txt: discuss branch-based vs. throwaway worktrees

40 - + worktree: teach `add` to recognize -d as shorthand for --detach

41 - + git-checkout.txt: document -d short option for --detach

42 -

43 - "git worktree add" learns that the "-d" is a synonym to "--detach"

44 - option to create a new worktree without being on a branch.

45 -

46 -

47 -* hn/refs-ref-log-only-bit (2020-09-08) 1 commit

48 - (merged to 'next' on 2020-09-09 at f729cb2c81)

49 - + refs: move REF_LOG_ONLY to refs-internal.h

50 -

51 - A bit of API reshuffling to make sure stuff common to all backends

52 - are not defined only in files backend.

53 -

54 -

55 -* jc/add-i-use-builtin-experimental (2020-09-08) 1 commit

56 - (merged to 'next' on 2020-09-09 at abcb7515dc)

57 - + add -i: use the built-in version when feature.experimental is set

23 +* al/ref-filter-merged-and-no-merged (2020-09-18) 5 commits

24 + (merged to 'next' on 2020-09-18 at cc2a0039f3)

25 + + Doc: prefer more specific file name

26 + + ref-filter: make internal reachable-filter API more precise

27 + (merged to 'next' on 2020-09-16 at b04e306660)

28 + + ref-filter: allow merged and no-merged filters

29 + + Doc: cover multiple contains/no-contains filters

30 + + t3201: test multiple branch filter combinations

31

59 - The "add -i/-p" machinery has been written in C but it is not used

60 - by default yet. It is made default to those who are participating

61 - in feature.experimental experiment.

32 + "git for-each-ref" and friends that list refs used to allow only

33 + one --merged or --no-merged to filter them; they learned to take

34 + combination of both kind of filtering.

35

36

64 -* jc/dist-tarball-tweak (2020-09-09) 1 commit

65 - (merged to 'next' on 2020-09-10 at 36cbe7ee9e)

66 - + Makefile: allow extra tweaking of distribution tarball

37 +* ar/fetch-ipversion-in-all (2020-09-15) 1 commit

38 + (merged to 'next' on 2020-09-21 at 0da2438668)

39 + + fetch: pass --ipv4 and --ipv6 options to sub-fetches

40

68 - Allow maintainers to tweak $(TAR) invocations done while making

69 - distribution tarballs.

41 + "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options

42 + to instances of the "git fetch" that talk to individual remotes,

43 + which has been corrected.

44

45

72 -* jc/quote-path-cleanup (2020-09-10) 7 commits

73 - (merged to 'next' on 2020-09-10 at 3bfde81846)

74 - + quote: turn 'nodq' parameter into a set of flags

75 - + quote: rename misnamed sq_lookup[] to cq_lookup[]

76 - + wt-status: consistently quote paths in "status --short" output

77 - + quote_path: code clarification

78 - + quote_path: optionally allow quoting a path with SP in it

79 - + quote_path: give flags parameter to quote_path()

80 - + quote_path: rename quote_path_relative() to quote_path()

46 +* cd/commit-graph-doc (2020-09-15) 1 commit

47 + (merged to 'next' on 2020-09-16 at b0816b6eb0)

48 + + commit-graph-format.txt: fix no-parent value

49

82 - "git status --short" quoted a path with SP in it when tracked, but

83 - not those that are untracked, ignored or unmerged. They are all

84 - shown quoted consistently.

50 + Doc update.

51

52

87 -* jk/add-i-fixes (2020-09-08) 2 commits

88 - (merged to 'next' on 2020-09-09 at 46ea071a7a)

89 - + add--interactive.perl: specify --no-color explicitly

90 - + add-patch: fix inverted return code of repo_read_index()

53 +* cs/don-t-pretend-a-failed-remote-set-head-succeeded (2020-09-17) 1 commit

54 + (merged to 'next' on 2020-09-18 at 51f73ca6dc)

55 + + remote: don't show success message when set-head fails

56

92 - "add -i/-p" fixes.

57 + "git remote set-head" that failed still said something that hints

58 + the operation went through, which was misleading.

59

60

95 -* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits

96 - (merged to 'next' on 2020-09-10 at 7853fe7e12)

97 - + submodule: use submodule repository when preparing summary

98 - + revision: use repository from rev_info when parsing commits

61 +* dl/complete-format-patch-recent-features (2020-09-17) 1 commit

62 + (merged to 'next' on 2020-09-18 at c0ec1f7569)

63 + + contrib/completion: complete options that take refs for format-patch

64

100 - "git diff/show" on a change that involves a submodule used to read

101 - the information on commits in the submodule from a wrong repository

102 - and gave a wrong information when the commit-graph is involved.

103 - cf. <xmqqzh667ca4.fsf@gitster.c.googlers.com>

65 + Update to command line completion (in contrib/)

66

67

106 -* mt/config-fail-nongit-early (2020-09-09) 1 commit

107 - (merged to 'next' on 2020-09-10 at 6f77f65b4e)

108 - + config: complain about --worktree outside of a git repo

68 +* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits

69 + (merged to 'next' on 2020-09-16 at d919bb3d1f)

70 + + format-patch: use 'origin' as start of current-series-range when known

71 + + diff-lib: tighten show_interdiff()'s interface

72 + + diff: move show_interdiff() from its own file to diff-lib

73

110 - Unlike "git config --local", "git config --worktree" did not fail

111 - early and cleanly when started outside a git repository.

74 + "format-patch --range-diff=<prev> <origin>..HEAD" has been taught

75 + not to ignore <origin> when <prev> is a single version.

76

77

114 -* os/collect-changed-submodules-optim (2020-09-06) 1 commit

115 - (merged to 'next' on 2020-09-10 at b6d9ed060e)

116 - + submodule: suppress checking for file name and ref ambiguity for object ids

78 +* hn/refs-trace-backend (2020-09-09) 1 commit

79 + (merged to 'next' on 2020-09-16 at f2e065ec17)

80 + + refs: add GIT_TRACE_REFS debugging mechanism

81

118 - Optimization around submodule handling.

82 + Developer support.

83

84

121 -* pb/clang-json-compilation-database (2020-09-06) 1 commit

122 - (merged to 'next' on 2020-09-09 at 9f5ea136f1)

123 - + Makefile: add support for generating JSON compilation database

85 +* jk/dont-count-existing-objects-twice (2020-09-17) 1 commit

86 + (merged to 'next' on 2020-09-18 at 73b30558b9)

87 + + packfile: actually set approximate_object_count_valid

88

125 - Developer support.

89 + There is a logic to estimate how many objects are in the

90 + repository, which is mean to run once per process invocation, but

91 + it ran every time the estimated value was requested.

92

93

128 -* pw/add-p-leakfix (2020-09-08) 1 commit

129 - (merged to 'next' on 2020-09-09 at 4206d0503c)

130 - + add -p: fix memory leak

94 +* jt/threaded-index-pack (2020-09-08) 7 commits

95 + (merged to 'next' on 2020-09-16 at 8542385cc0)

96 + + index-pack: make quantum of work smaller

97 + + index-pack: make resolve_delta() assume base data

98 + + index-pack: calculate {ref,ofs}_{first,last} early

99 + + index-pack: remove redundant child field

100 + + index-pack: unify threaded and unthreaded code

101 + + index-pack: remove redundant parameter

102 + + Documentation: deltaBaseCacheLimit is per-thread

103

132 - Leakfix.

104 + "git index-pack" learned to resolve deltified objects with greater

105 + parallelism.

106

107

135 -* rs/misc-cleanups (2020-09-06) 3 commits

136 - (merged to 'next' on 2020-09-09 at 4a19ea9672)

137 - + pack-bitmap-write: use hashwrite_be32() in write_hash_cache()

138 - + midx: use hashwrite_u8() in write_midx_header()

139 - + fast-import: use write_pack_header()

108 +* kk/build-portability-fix (2020-09-09) 1 commit

109 + (merged to 'next' on 2020-09-16 at 63f2672632)

110 + + Fit to Plan 9's ANSI/POSIX compatibility layer

111

141 - Misc cleanups.

112 + Portability tweak for some shell scripts used while building.

113

114

144 -* rs/parallel-read-cache-fix (2020-09-06) 1 commit

145 - (merged to 'next' on 2020-09-09 at 92953a75c4)

146 - + read-cache: fix mem-pool allocation for multi-threaded index loading

115 +* ls/mergetool-meld-auto-merge (2020-09-16) 1 commit

116 + (merged to 'next' on 2020-09-16 at 01985a671b)

117 + + mergetool: allow auto-merge for meld to follow the vim-diff behavior

118

148 - A follow-up fix to a topic already in 'master'.

119 + The 'meld' backend of the "git mergetool" learned to give the

120 + underlying 'meld' the '--auto-merge' option, which would help

121 + reduce the amount of text that requires manual merging.

122

123

151 -* rs/refspec-leakfix (2020-09-06) 2 commits

152 - (merged to 'next' on 2020-09-09 at 10741e90a5)

153 - + refspec: add and use refspec_appendf()

154 - + push: release strbufs used for refspec formatting

124 +* os/fetch-submodule-optim (2020-09-06) 1 commit

125 + (merged to 'next' on 2020-09-16 at fa39e3f211)

126 + + fetch: do not look for submodule changes in unchanged refs

127

156 - Leakfix.

128 + Optimization around submodule handling.

129

130

159 -* so/log-tree-diff-cleanup (2020-09-06) 2 commits

160 - (merged to 'next' on 2020-09-09 at f8744b8e8a)

161 - + log_tree_diff: get rid of extra check for NULL

162 - + log_tree_diff: get rid of code duplication for first_parent_only

131 +* pw/add-p-edit-ita-path (2020-09-09) 1 commit

132 + (merged to 'next' on 2020-09-16 at 7540ed3c0e)

133 + + add -p: fix editing of intent-to-add paths

134

164 - Code cleanup.

135 + "add -p" now allows editing paths that were only added in intent.

136

137 --------------------------------------------------

138 [New Topics]

139

169 -* cs/don-t-pretend-a-failed-remote-set-head-succeeded (2020-09-17) 1 commit

170 - (merged to 'next' on 2020-09-18 at 51f73ca6dc)

171 - + remote: don't show success message when set-head fails

140 +* ld/p4-unshelve-fix (2020-09-19) 2 commits

141 + (merged to 'next' on 2020-09-22 at c7709a34ec)

142 + + git-p4: use HEAD~$n to find parent commit for unshelve

143 + + git-p4 unshelve: adding a commit breaks git-p4 unshelve

144

173 - "git remote set-head" that failed still said something that hints

174 - the operation went through, which was misleading.

145 + The "unshelve" subcommand of "git p4" used incorrectly used

146 + commit^N where it meant to say commit~N to name the Nth generation

147 + ancestor, which has been corrected.

148

149 Will merge to 'master'.

150

151

179 -* dl/diff-merge-base (2020-09-17) 10 commits

180 - - contrib/completion: complete `git diff --merge-base`

181 - - builtin/diff-tree: learn --merge-base

182 - - builtin/diff-index: learn --merge-base

183 - - t4068: add --merge-base tests

184 - - diff-lib: define diff_get_merge_base()

185 - - diff-lib: accept option flags in run_diff_index()

186 - - contrib/completion: extract common diff/difftool options

187 - - git-diff.txt: backtick quote command text

188 - - git-diff-index.txt: make --cached description a proper sentence

189 - - t4068: remove unnecessary >tmp

190 -

191 - "git diff A...B" learned "git diff --merge-base A B", which is a

192 - longer short-hand to say the same thing.

152 +* rs/archive-add-file (2020-09-19) 3 commits

153 + - Makefile: use git-archive --add-file

154 + - archive: add --add-file

155 + - archive: read short blobs in archive.c::write_archive_entry()

156

194 - Expecting a reroll.

195 - cf. <20200917181303.GA108156@coredump.intra.peff.net>,

196 - <xmqqh7rws5hm.fsf@gitster.c.googlers.com>, etc.

157 + "git archive" learns the "--add-file" option to include untracked

158 + files into a snapshot from a tree-ish.

159

160

199 -* jk/dont-count-existing-objects-twice (2020-09-17) 1 commit

200 - (merged to 'next' on 2020-09-18 at 73b30558b9)

201 - + packfile: actually set approximate_object_count_valid

161 +* jk/diff-highlight-blank-match-fix (2020-09-21) 1 commit

162 + (merged to 'next' on 2020-09-22 at 03ac708501)

163 + + diff-highlight: correctly match blank lines for flush

164

203 - There is a logic to estimate how many objects are in the

204 - repository, which is mean to run once per process invocation, but

205 - it ran every time the estimated value was requested.

165 + "diff-highlight" (in contrib/) had a logic to flush its output upon

166 + seeing a blank line but the way it detected a blank line was broken.

167

168 Will merge to 'master'.

169

170

210 -* dl/complete-format-patch-recent-features (2020-09-17) 1 commit

211 - (merged to 'next' on 2020-09-18 at c0ec1f7569)

212 - + contrib/completion: complete options that take refs for format-patch

213 -

214 - Update to command line completion (in contrib/)

215 -

216 - Will merge to 'master'.

171 +* js/default-branch-name-part-2 (2020-09-21) 5 commits

172 + - t9902: avoid using the branch name `master`

173 + - tests: avoid variations of the `master` branch name

174 + - t3200: avoid variations of the `master` branch name

175 + - fast-export: avoid using unnecessary language in a code comment

176 + - t/test-terminal: avoid non-inclusive language

177

178 + Update the tests to drop word 'master' from them

179

219 -* js/ignore-cmake-build-artifacts (2020-09-17) 1 commit

220 - - cmake: ignore generated files

180

222 - Running CMake based build with VS (in contrib/) from the top-level

223 - of the working tree leaves extra build crufts behind. Add patterns

224 - to .gitignore

181 +* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-21) 2 commits

182 + - fetch: do not override partial clone filter

183 + - promisor-remote: remove unused variable

184

226 - Expecting a resolution in a better way.

227 - cf. <xmqq7dsrnjhi.fsf@gitster.c.googlers.com>

228 - It turns out that these crufts are visible only when the CMake

229 - based build procedure is used against the best practice. A better

230 - alternative may be to prominently describe the recommended way to

231 - use the CMake-based build procedure.

185 + The lazy fetching done internally to make missing objects available

186 + in a partial clone incorrectly made permanent damate to the partial

187 + clone filter in the repository, which has been corrected.

188

189

234 -* hx/push-atomic-with-cert (2020-09-18) 1 commit

235 - - send-pack: run GPG after atomic push checking

190 +* rs/misc-cleanups (2020-09-19) 1 commit

191 + (merged to 'next' on 2020-09-22 at d034fbfab0)

192 + + pack-write: use hashwrite_be32() in write_idx_file()

193

237 - "git push" that wants to be atomic and wants to send push

238 - certificate learned not to prepare and sign the push certificate

239 - when it fails the local check (hence due to atomicity it is known

240 - that no certificate is needed).

194 + Code cleanup.

195

242 - Expecting a reroll.

243 - cf. <xmqqft7eljkz.fsf@gitster.c.googlers.com>

196 + Will merge to 'master'.

197

198 --------------------------------------------------

199 [Stalled]

@@ -288,40 +241,58 @@ repositories listed at

241 --------------------------------------------------

242 [Cooking]

243

291 -* kk/build-portability-fix (2020-09-09) 1 commit

292 - (merged to 'next' on 2020-09-16 at 63f2672632)

293 - + Fit to Plan 9's ANSI/POSIX compatibility layer

244 +* dl/diff-merge-base (2020-09-21) 10 commits

245 + - contrib/completion: complete `git diff --merge-base`

246 + - builtin/diff-tree: learn --merge-base

247 + - builtin/diff-index: learn --merge-base

248 + - t4068: add --merge-base tests

249 + - diff-lib: define diff_get_merge_base()

250 + - diff-lib: accept option flags in run_diff_index()

251 + - contrib/completion: extract common diff/difftool options

252 + - git-diff.txt: backtick quote command text

253 + - git-diff-index.txt: make --cached description a proper sentence

254 + - t4068: remove unnecessary >tmp

255

295 - Portability tweak for some shell scripts used while building.

256 + "git diff A...B" learned "git diff --merge-base A B", which is a

257 + longer short-hand to say the same thing.

258

297 - Will merge to 'master'.

259

260 +* js/ignore-cmake-build-artifacts (2020-09-17) 1 commit

261 + - cmake: ignore generated files

262

300 -* al/ref-filter-merged-and-no-merged (2020-09-18) 5 commits

301 - (merged to 'next' on 2020-09-18 at cc2a0039f3)

302 - + Doc: prefer more specific file name

303 - + ref-filter: make internal reachable-filter API more precise

304 - (merged to 'next' on 2020-09-16 at b04e306660)

305 - + ref-filter: allow merged and no-merged filters

306 - + Doc: cover multiple contains/no-contains filters

307 - + t3201: test multiple branch filter combinations

263 + Running CMake based build with VS (in contrib/) from the top-level

264 + of the working tree leaves extra build crufts behind. Add patterns

265 + to .gitignore

266 +

267 + Expecting a resolution in a better way.

268 + cf. <xmqq7dsrnjhi.fsf@gitster.c.googlers.com>

269 + It turns out that these crufts are visible only when the CMake

270 + based build procedure is used against the best practice. A better

271 + alternative may be to prominently describe the recommended way to

272 + use the CMake-based build procedure.

273

309 - "git for-each-ref" and friends that list refs used to allow only

310 - one --merged or --no-merged to filter them; they learned to take

311 - combination of both kind of filtering.

274 +

275 +* hx/push-atomic-with-cert (2020-09-19) 1 commit

276 + (merged to 'next' on 2020-09-22 at 64561eea5b)

277 + + send-pack: run GPG after atomic push checking

278 +

279 + "git push" that wants to be atomic and wants to send push

280 + certificate learned not to prepare and sign the push certificate

281 + when it fails the local check (hence due to atomicity it is known

282 + that no certificate is needed).

283

284 Will merge to 'master'.

285

286

316 -* bc/faq-misc (2020-09-14) 3 commits

317 - - docs: explain how to deal with files that are always modified

318 - - docs: explain why reverts are not always applied on merge

319 - - docs: explain why squash merges are broken with long-running branches

287 +* bc/faq-misc (2020-09-20) 3 commits

288 + (merged to 'next' on 2020-09-22 at a81b728010)

289 + + docs: explain how to deal with files that are always modified

290 + + docs: explain why reverts are not always applied on merge

291 + + docs: explain why squash merges are broken with long-running branches

292

293 More FAQ entries.

294

323 - Expecting a reroll.

324 - cf. <20200913171206.GO241078@camp.crustytoothpaste.net>

295 + Will merge to 'master'.

296

297

298 * sb/clone-origin (2020-09-11) 4 commits

@@ -337,18 +308,23 @@ repositories listed at

308 Expecting an update.

309

310

340 -* sk/force-if-includes (2020-09-14) 8 commits

341 - - SQUASH???

342 - - t: add tests for "force-if-includes"

343 - - doc: add reference for "--[no-]force-if-includes"

344 - - builtin/push: add option "--[no-]force-if-includes"

345 - - transport-helper: update ref status for "force-if-includes"

346 - - send-pack: check ref status for "force-if-includes"

347 - - transport: add flag for "--[no-]force-if-includes"

348 - - remote: add reflog check for "force-if-includes"

311 +* sk/force-if-includes (2020-09-19) 3 commits

312 + - t, doc: update tests, reference for "--force-if-includes"

313 + - push: parse and set flag for "--force-if-includes"

314 + - push: add reflog check for "--force-if-includes"

315 +

316 + "git push --force-with-lease[=<ref>]" can easily be misused to lose

317 + commits unless the user takes good care of their own "git fetch".

318 + A new option "--force-if-includes" attempts to ensure that what is

319 + being force-pushed was created after examining the commit at the

320 + tip of the remote ref that is about to be force-replaced.

321

322

351 -* ab/mediawiki-fixes (2020-09-16) 15 commits

323 +* ab/mediawiki-fixes (2020-09-21) 18 commits

324 + - remote-mediawiki: use "sh" to eliminate unquoted commands

325 + - remote-mediawiki: annotate unquoted uses of run_git()

326 + - remote-mediawiki: convert to quoted run_git() invocation

327 + - remote-mediawiki: provide a list form of run_git()

328 - remote-mediawiki tests: annotate failing tests

329 - remote-mediawiki: fix duplicate revisions being imported

330 - remote-mediawiki tests: use CLI installer

@@ -357,26 +333,15 @@ repositories listed at

333 - remote-mediawiki tests: use a more idiomatic dispatch table

334 - remote-mediawiki tests: use "$dir/" instead of "$dir."

335 - remote-mediawiki tests: change `[]` to `test`

360 - - remote-mediawiki tests: guard test_cmp with test_path_is_file

336 - remote-mediawiki tests: use test_cmp in tests

337 - remote-mediawiki tests: use a 10 character password

338 - remote-mediawiki tests: use the login/password variables

364 - - remote-mediawiki doc: bump recommended PHP version to 7.3

339 + - remote-mediawiki doc: don't hardcode Debian PHP versions

340 - remote-mediawiki doc: link to MediaWiki's current version

341 - remote-mediawiki doc: correct link to GitHub project

342

343 Modernization and fixes to MediaWiki remote backend.

344

370 - Expecting a reroll.

371 -

372 -

373 -* ar/fetch-ipversion-in-all (2020-09-15) 1 commit

374 - - fetch: pass --ipv4 and --ipv6 options to sub-fetches

375 -

376 - "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options

377 - to instances of the "git fetch" that talk to individual remotes,

378 - which has been corrected.

379 -

345 Will merge to 'next'.

346

347

@@ -388,23 +353,15 @@ repositories listed at

353 Needs more work.

354

355

391 -* bc/clone-with-git-default-hash-fix (2020-09-15) 1 commit

392 - - builtin/clone: avoid failure with GIT_DEFAULT_HASH

356 +* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit

357 + (merged to 'next' on 2020-09-22 at 62ea45c20e)

358 + + builtin/clone: avoid failure with GIT_DEFAULT_HASH

359

360 "git clone" that clones from SHA-1 repository, while

361 GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an

362 unusable repository that half-claims to be SHA-256 repository

363 with SHA-1 objects and refs. This has been corrected.

364

399 - Expecting a reroll.

400 -

401 -

402 -* cd/commit-graph-doc (2020-09-15) 1 commit

403 - (merged to 'next' on 2020-09-16 at b0816b6eb0)

404 - + commit-graph-format.txt: fix no-parent value

405 -

406 - Doc update.

407 -

365 Will merge to 'master'.

366

367

@@ -445,67 +402,27 @@ repositories listed at

402 other scheduling system configuration) for it.

403

404

448 -* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits

449 - (merged to 'next' on 2020-09-16 at d919bb3d1f)

450 - + format-patch: use 'origin' as start of current-series-range when known

451 - + diff-lib: tighten show_interdiff()'s interface

452 - + diff: move show_interdiff() from its own file to diff-lib

453 -

454 - Code cleanup and teach "format-patch --range-diff=<prev>

455 - <origin>..HEAD" not ignore <origin> when <prev> is a single

456 - version.

457 -

458 - Will merge to 'master'.

459 -

460 -

461 -* os/fetch-submodule-optim (2020-09-06) 1 commit

462 - (merged to 'next' on 2020-09-16 at fa39e3f211)

463 - + fetch: do not look for submodule changes in unchanged refs

464 -

465 - Optimization around submodule handling.

466 -

467 - Will merge to 'master'.

468 -

469 -

470 -* pw/add-p-edit-ita-path (2020-09-09) 1 commit

471 - (merged to 'next' on 2020-09-16 at 7540ed3c0e)

472 - + add -p: fix editing of intent-to-add paths

473 -

474 - "add -p" did not allow editing paths that were only added in

475 - intent.

476 -

477 - Will merge to 'master'.

478 -

479 -

480 -* hn/refs-trace-backend (2020-09-09) 1 commit

481 - (merged to 'next' on 2020-09-16 at f2e065ec17)

482 - + refs: add GIT_TRACE_REFS debugging mechanism

483 -

484 - Developer support.

485 -

486 - Will merge to 'master'.

487 -

488 -

405 * tb/bloom-improvements (2020-09-18) 13 commits

490 - - commit-graph: introduce 'commitGraph.maxNewFilters'

491 - - builtin/commit-graph.c: introduce '--max-new-filters=<n>'

492 - - commit-graph: rename 'split_commit_graph_opts'

493 - - bloom: encode out-of-bounds filters as non-empty

494 - - bloom/diff: properly short-circuit on max_changes

495 - - bloom: use provided 'struct bloom_filter_settings'

496 - - bloom: split 'get_bloom_filter()' in two

497 - - commit-graph.c: store maximum changed paths

498 - - commit-graph: respect 'commitGraph.readChangedPaths'

499 - - t/helper/test-read-graph.c: prepare repo settings

500 - - commit-graph: pass a 'struct repository *' in more places

501 - - t4216: use an '&&'-chain

502 - - commit-graph: introduce 'get_bloom_filter_settings()'

406 + (merged to 'next' on 2020-09-22 at 520d531ad8)

407 + + commit-graph: introduce 'commitGraph.maxNewFilters'

408 + + builtin/commit-graph.c: introduce '--max-new-filters=<n>'

409 + + commit-graph: rename 'split_commit_graph_opts'

410 + + bloom: encode out-of-bounds filters as non-empty

411 + + bloom/diff: properly short-circuit on max_changes

412 + + bloom: use provided 'struct bloom_filter_settings'

413 + + bloom: split 'get_bloom_filter()' in two

414 + + commit-graph.c: store maximum changed paths

415 + + commit-graph: respect 'commitGraph.readChangedPaths'

416 + + t/helper/test-read-graph.c: prepare repo settings

417 + + commit-graph: pass a 'struct repository *' in more places

418 + + t4216: use an '&&'-chain

419 + + commit-graph: introduce 'get_bloom_filter_settings()'

420

421 "git commit-graph write" learned to limit the number of bloom

422 filters that are computed from scratch with the --max-new-filters

423 option.

424

508 - Will merge to 'next'.

425 + Will merge to 'master'.

426

427

428 * es/config-hooks (2020-09-09) 9 commits

@@ -522,17 +439,6 @@ repositories listed at

439 The "hooks defined in config" topic.

440

441

525 -* ls/mergetool-meld-auto-merge (2020-09-16) 1 commit

526 - (merged to 'next' on 2020-09-16 at 01985a671b)

527 - + mergetool: allow auto-merge for meld to follow the vim-diff behavior

528 -

529 - The 'meld' backend of the "git mergetool" learned to give the

530 - underlying 'meld' the '--auto-merge' option, which would help

531 - reduce the amount of text that requires manual merging.

532 -

533 - Will merge to 'master'.

534 -

535 -

442 * mt/grep-sparse-checkout (2020-09-10) 9 commits

443 - config: add setting to ignore sparsity patterns in some cmds

444 - grep: honor sparse checkout patterns

@@ -578,9 +484,9 @@ repositories listed at

484 cf. <nycvar.QRO.7.76.6.2009031403510.56@tvgsbejvaqbjf.bet>

485

486

581 -* js/no-builtins-on-disk-option (2020-08-24) 3 commits

487 +* js/no-builtins-on-disk-option (2020-09-21) 3 commits

488 - ci: stop linking built-ins to the dashed versions

583 - - install: optionally skip linking/copying the built-ins

489 + - Optionally skip linking/copying the built-ins

490 - msvc: copy the correct `.pdb` files in the Makefile target `install`

491

492 The installation procedure learned to optionally omit "git-foo"

@@ -594,26 +500,7 @@ repositories listed at

500 worth to keep this topic separate from such a policy change to help

501 it graduate early.

502

597 - Expecting a reroll to update log message for the last one.

598 - as it confused at least two reviewers.

599 - cf. <xmqqwo1baop3.fsf@gitster.c.googlers.com>

600 - cf. <20200903104537.GA27325@szeder.dev>

601 -

602 -

603 -* jt/threaded-index-pack (2020-09-08) 7 commits

604 - (merged to 'next' on 2020-09-16 at 8542385cc0)

605 - + index-pack: make quantum of work smaller

606 - + index-pack: make resolve_delta() assume base data

607 - + index-pack: calculate {ref,ofs}_{first,last} early

608 - + index-pack: remove redundant child field

609 - + index-pack: unify threaded and unthreaded code

610 - + index-pack: remove redundant parameter

611 - + Documentation: deltaBaseCacheLimit is per-thread

612 -

613 - "git index-pack" learned to resolve deltified objects with greater

614 - parallelism.

615 -

616 - Will merge to 'master'.

503 + Will merge to 'next'.

504

505

506 * jk/refspecs-negative (2020-09-18) 2 commits

What's cooking (2020/09 #06)