5aec8f4235 · matheusbsbs/matheus-bagliano

@@ -1,29 +1,15 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2022, #03; Thu, 13)

4 -X-master-at: 1ffcbaa1a5f10c9f706314d77f88de20a4a498c2

5 -X-next-at: 00780c9af44409a68481c82f63a97bd18bb2593e

3 +Subject: What's cooking in git.git (Jan 2022, #04; Fri, 14)

4 +X-master-at: df3c41adeb212432c53d93ce6ace5d5374dc6e11

5 +X-next-at: 5990c1f58f12b2d9f2b7f4f857bac2a6b2a461e0

6

7 -What's cooking in git.git (Jan 2022, #03; Thu, 13)

7 +What's cooking in git.git (Jan 2022, #04; Fri, 14)

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

9

10 -There are a few "oops, what we merged recently is broken" topics

11 -that still are not in 'master', but otherwise what we have should

12 -be pretty much what we'll have in the final one.

13 -

14 - - I am reasonably happy with ab/refs-errno-cleanup (just one patch)

15 - that fixes the incorrect state of the code left by the earlier

16 - parts of the topic that have already been merged during this

17 - cycle.

18 -

19 - - I am also OK with ab/reftable-build-fixes (two patches), one for

20 - general type correctness fix, the other for helping older sub-C99

21 - compilers.

22 -

23 -If there are fixes for regressions that we introduced during this

24 -cycle other than these two topics, I certainly am missing them, so

25 -please holler loudly and quickly, hopefully in time for me to tag

26 -the -rc1 tomorrow.

10 +I just tagged Git 2.35-rc1 with a few last-minute fixes. Let's make

11 +sure we can find and fix any remaining regressions introduced during

12 +this cycle before the final.

13

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

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

@@ -67,336 +53,126 @@ Release tarballs are available at:

53 --------------------------------------------------

54 [Graduated to 'master']

55

70 -* ab/do-not-limit-stash-help-to-push (2021-12-16) 1 commit

71 - (merged to 'next' on 2022-01-03 at adfc0c1f17)

72 - + stash: don't show "git stash push" usage on bad "git stash" usage

73 -

74 - "git stash" by default triggers its "push" action, but its

75 - implementation also made "git stash -h" to show short help only for

76 - "git stash push", which has been corrected.

77 - source: <patch-v3-1.1-6b33b104c84-20211216T125317Z-avarab@gmail.com>

78 -

79 -

80 -* ab/makefile-hook-list-dependency-fix (2021-12-25) 1 commit

81 - (merged to 'next' on 2022-01-03 at 8c8ca0cbce)

82 - + Makefile: correct the dependency graph of hook-list.h

83 -

84 - Fix dependency rules to generate hook-list.h header file.

85 - source: <patch-1.1-1fafa6c643b-20211217T001137Z-avarab@gmail.com>

86 -

87 -

88 -* ab/makefile-msgfmt-wo-stats (2021-12-25) 1 commit

89 - (merged to 'next' on 2022-01-03 at 2e2097c310)

90 - + Makefile: don't invoke msgfmt with --statistics

91 -

92 - Make the recipe that runs msgfmt less noisy.

93 - source: <patch-1.1-58408f384e7-20211217T000729Z-avarab@gmail.com>

94 -

95 -

96 -* ab/makefile-pager-env-is-used-only-by-pager.c (2021-12-25) 1 commit

97 - (merged to 'next' on 2022-01-03 at 7ab1e1c5c4)

98 - + Makefile: move -DPAGER_ENV from BASIC_CFLAGS to EXTRA_CPPFLAGS

99 -

100 - source: <patch-1.1-90d1e77ad5e-20211217T001628Z-avarab@gmail.com>

101 -

102 -

103 -* ab/reflog-prep (2021-12-22) 9 commits

104 - (merged to 'next' on 2022-01-03 at 07d2d78d86)

105 - + reflog + refs-backend: move "verbose" out of the backend

106 - + refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN

107 - + reflog: reduce scope of "struct rev_info"

108 - + reflog expire: don't use lookup_commit_reference_gently()

109 - + reflog expire: refactor & use "tip_commit" only for UE_NORMAL

110 - + reflog expire: use "switch" over enum values

111 - + reflog: change one->many worktree->refnames to use a string_list

112 - + reflog expire: narrow scope of "cb" in cmd_reflog_expire()

113 - + reflog delete: narrow scope of "cmd" passed to count_reflog_ent()

114 - (this branch is used by jc/reflog-parse-options.)

115 -

116 - Code refactoring in the reflog part of refs API.

117 - source: <cover-v3-0.9-00000000000-20211222T040557Z-avarab@gmail.com>

118 -

119 -

120 -* ab/usage-die-message (2021-12-07) 6 commits

121 - (merged to 'next' on 2022-01-03 at 0ef3860099)

122 - + config API: use get_error_routine(), not vreportf()

123 - + usage.c + gc: add and use a die_message_errno()

124 - + gc: return from cmd_gc(), don't call exit()

125 - + usage.c API users: use die_message() for error() + exit 128

126 - + usage.c API users: use die_message() for "fatal :" + exit 128

127 - + usage.c: add a die_message() routine

128 -

129 - Code clean-up to hide vreportf() from public API.

130 - source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>

131 -

132 -

133 -* ak/protect-any-current-branch (2022-01-12) 1 commit

134 - (merged to 'next' on 2022-01-12 at 5ad87959d2)

135 - + branch: missing space fix at line 313

136 -

137 - source: <20220111123627.58625-1-bagasdotme@gmail.com>

138 -

139 -

140 -* ds/fetch-pull-with-sparse-index (2021-12-22) 5 commits

141 - (merged to 'next' on 2022-01-03 at f58da4a878)

142 - + test-read-cache: remove --table, --expand options

143 - + t1091/t3705: remove 'test-tool read-cache --table'

144 - + t1092: replace 'read-cache --table' with 'ls-files --sparse'

145 - + ls-files: add --sparse option

146 - + fetch/pull: use the sparse index

147 -

148 - "git fetch" and "git pull" are now declared sparse-index clean.

149 - Also "git ls-files" learns the "--sparse" option to help debugging.

150 - source: <pull.1080.v4.git.1640182856.gitgitgadget@gmail.com>

151 -

152 -

153 -* ds/sparse-checkout-malformed-pattern-fix (2021-12-30) 3 commits

154 - (merged to 'next' on 2021-12-30 at c8b2ade48c)

155 - + sparse-checkout: refuse to add to bad patterns

156 - + sparse-checkout: fix OOM error with mixed patterns

157 - + sparse-checkout: fix segfault on malformed patterns

158 -

159 - Certain sparse-checkout patterns that are valid in non-cone mode

160 - led to segfault in cone mode, which has been corrected.

161 - source: <pull.1069.v4.git.1639671222.gitgitgadget@gmail.com>

162 -

163 -

164 -* en/merge-ort-renorm-with-rename-delete-conflict-fix (2021-12-30) 1 commit

165 - (merged to 'next' on 2022-01-05 at bb81dd432d)

166 - + merge-ort: fix bug with renormalization and rename/delete conflicts

167 -

168 - A corner case bug in the ort merge strategy has been corrected.

169 - source: <pull.1174.git.git.1640650846612.gitgitgadget@gmail.com>

170 -

171 -

172 -* en/stash-df-fix (2022-01-04) 1 commit

173 - (merged to 'next' on 2022-01-06 at 22d0c6ccf7)

174 - + stash: do not return before restoring untracked files

175 -

176 - "git stash apply" forgot to attempt restoring untracked files when

177 - it failed to restore changes to tracked ones.

178 - source: <pull.1180.git.git.1641337498996.gitgitgadget@gmail.com>

179 -

180 -

181 -* fs/gpg-unknown-key-test-fix (2022-01-12) 1 commit

182 - (merged to 'next' on 2022-01-12 at 80d3416168)

183 - + t/gpg: simplify test for unknown key

184 -

185 - Test simplification.

186 - source: <20220112120757.874714-1-fs@gigacodes.de>

187 -

188 -

189 -* fs/ssh-signing-key-lifetime (2022-01-10) 1 commit

190 - (merged to 'next' on 2022-01-12 at 8541f3399c)

191 - + fmt-merge-msg: prevent use-after-free with signed tags

192 -

193 - "git merge $signed_tag" started to drop the tag message from the

194 - default merge message it uses by accident, which has been corrected.

195 - source: <6e08b73d602853b3de71257117e85e32b96b5c19.1641849502.git.me@ttaylorr.com>

196 -

197 -

198 -* hn/ref-api-tests-update (2021-12-22) 4 commits

199 - (merged to 'next' on 2022-01-03 at 6815d4d8c1)

200 - + t7004: use "test-tool ref-store" for reflog inspection

201 - + t7004: create separate tags for different tests

202 - + t5550: require REFFILES

203 - + t5540: require REFFILES

204 -

205 - Test updates.

206 - source: <pull.1168.git.git.1640170784.gitgitgadget@gmail.com>

207 -

208 -

209 -* hn/refs-debug-update (2021-12-22) 3 commits

210 - (merged to 'next' on 2022-01-03 at 1cd451c66c)

211 - + refs: centralize initialization of the base ref_store.

212 - + refs: print error message in debug output

213 - + refs: pass gitdir to packed_ref_store_create

214 -

215 - Debugging support for refs API.

216 - source: <pull.1163.v2.git.git.1640196714.gitgitgadget@gmail.com>

217 -

218 -

219 -* hn/reftable-fixes (2021-12-23) 3 commits

220 - (merged to 'next' on 2022-01-03 at 532f9bbb27)

221 - + reftable: support preset file mode for writing

222 - + reftable: signal overflow

223 - + reftable: fix typo in header

224 -

225 - Assorted fixlets in reftable code.

226 - source: <pull.1164.git.git.1640287790.gitgitgadget@gmail.com>

227 -

228 -

229 -* hn/test-ref-store-show-hash-algo (2021-12-21) 1 commit

230 - (merged to 'next' on 2022-01-03 at 3cdbfeeaf1)

231 - + test-ref-store: print hash algorithm

232 -

233 - Debugging support for refs API.

234 - source: <pull.1167.git.git.1640092500725.gitgitgadget@gmail.com>

235 -

236 -

237 -* ja/i18n-similar-messages (2022-01-05) 11 commits

238 - (merged to 'next' on 2022-01-06 at 6440d8fdf2)

239 - + i18n: turn even more messages into "cannot be used together" ones

240 - + i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"

241 - + i18n: factorize "--foo outside a repository"

242 - + i18n: refactor "unrecognized %(foo) argument" strings

243 - + i18n: factorize "no directory given for --foo"

244 - + i18n: factorize "--foo requires --bar" and the like

245 - + i18n: tag.c factorize i18n strings

246 - + i18n: standardize "cannot open" and "cannot read"

247 - + i18n: turn "options are incompatible" into "cannot be used together"

248 - + i18n: refactor "%s, %s and %s are mutually exclusive"

249 - + i18n: refactor "foo and bar are mutually exclusive"

250 -

251 - Similar message templates have been consolidated so that

252 - translators need to work on fewer number of messages.

253 - source: <pull.1088.v5.git.1641412944.gitgitgadget@gmail.com>

254 -

255 -

256 -* ja/perf-use-specified-shell (2021-12-25) 1 commit

257 - (merged to 'next' on 2022-01-03 at 8ca35ee3d0)

258 - + t/perf: do not run tests in user's $SHELL

259 -

260 - Perf tests were run with end-user's shell, but it has been

261 - corrected to use the shell specified by $TEST_SHELL_PATH.

262 - source: <20211225081656.1311583-1-aclopte@gmail.com>

263 -

264 -

265 -* jc/doc-submitting-patches-choice-of-base (2021-12-30) 1 commit

266 - (merged to 'next' on 2022-01-05 at eb97c01c24)

267 - + SubmittingPatchs: clarify choice of base and testing

268 -

269 - Extend the guidance to choose the base commit to build your work

270 - on, and hint/nudge contributors to read others' changes.

271 - source: <xmqqh7apsv6s.fsf_-_@gitster.g>

272 -

273 -

274 -* jh/p4-human-unit-numbers (2021-12-20) 2 commits

275 - (merged to 'next' on 2022-01-03 at c385766ff4)

276 - + git-p4: show progress as an integer

277 - + git-p4: print size values in appropriate units

278 -

279 - The way "git p4" shows file sizes in its output has been updated to

280 - use human-readable units.

281 - source: <20211219154028.3288756-1-jholdsworth@nvidia.com>

282 -

283 -

284 -* jh/p4-remove-unused (2021-12-22) 2 commits

285 - (merged to 'next' on 2022-01-03 at 43f61b2fef)

286 - + git-p4: remove "rollback" verb

287 - + git-p4: remove "debug" verb

288 -

289 - Remove a few commands from "git p4" that aren't very useful.

290 - source: <20211222145552.93786-1-jholdsworth@nvidia.com>

291 -

292 -

293 -* jl/subtree-check-parents-argument-passing-fix (2022-01-04) 1 commit

294 - (merged to 'next' on 2022-01-05 at 7dc995f026)

295 - + subtree: fix argument handling in check_parents

296 -

297 - Fix performance-releated bug in "git subtree" (in contrib/).

298 - source: <pull.1086.v4.git.1638929518657.gitgitgadget@gmail.com>

299 -

300 -

301 -* js/branch-track-inherit (2021-12-20) 3 commits

302 - (merged to 'next' on 2022-01-03 at ab5fb34db3)

303 - + config: require lowercase for branch.*.autosetupmerge

304 - + branch: add flags and config to inherit tracking

305 - + branch: accept multiple upstream branches for tracking

306 - (this branch is used by gc/branch-recurse-submodules.)

56 +* ab/refs-errno-cleanup (2022-01-13) 1 commit

57 + (merged to 'next' on 2022-01-14 at 00bb61876a)

58 + + refs API: use "failure_errno", not "errno"

59

308 - "git -c branch.autosetupmerge=inherit branch new old" makes "new"

309 - to have the same upstream as the "old" branch, instead of marking

310 - "old" itself as its upstream.

311 - source: <cover.1640039978.git.steadmon@google.com>

60 + A brown-paper-bag fix on top of a topic that was merged during this

61 + cycle.

62 + source: <patch-v3-1.3-a45268ac24b-20220112T123117Z-avarab@gmail.com>

63

64

314 -* js/l10n-mention-ngettext-early-in-readme (2021-12-21) 1 commit

315 - (merged to 'next' on 2022-01-03 at a644f898ce)

316 - + l10n: README: call more attention to plural strings

65 +* ab/reftable-build-fixes (2022-01-13) 2 commits

66 + (merged to 'next' on 2022-01-14 at ebd978ea66)

67 + + reftable tests: avoid "int" overflow, use "uint64_t"

68 + + reftable: avoid initializing structs from structs

69

318 - Localization doc update.

319 - source: <25107068cbbf8c9ce6886e66e25dff19e072583f.1639425295.git.steadmon@google.com>

70 + A few portability tweaks.

71 + source: <cover-0.3-00000000000-20220111T163908Z-avarab@gmail.com>

72

73

322 -* jt/pack-header-lshift-overflow (2022-01-12) 1 commit

323 - (merged to 'next' on 2022-01-12 at fa27107ab3)

324 - + packfile: fix off-by-one error in decoding logic

74 +* js/t1450-making-it-writable-does-not-need-full-posixperm (2022-01-13) 1 commit

75 + (merged to 'next' on 2022-01-14 at fd4f2f4bb4)

76 + + t1450-fsck: exec-bit is not needed to make loose object writable

77

326 - source: <xmqq4k68u30t.fsf@gitster.g>

78 + Test fix.

79 + source: <529d99f3-13c8-ffc1-dd4c-3fc70330262a@kdbg.org>

80

81 +--------------------------------------------------

82 +[Stalled]

83

329 -* jz/apply-3-corner-cases (2021-12-20) 1 commit

330 - (merged to 'next' on 2022-01-03 at cb8e19c304)

331 - + git-apply: skip threeway in add / rename cases

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

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

86

333 - "git apply --3way" bypasses the attempt to do a three-way

334 - application in more cases to address the regression caused by the

335 - recent change to use direct application as a fallback.

336 - source: <20211217224328.7646-1-jerry@skydio.com>

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

88 + for the smart HTTP transport, sends a "404 Not found" error, we

89 + deliberately did not say anything to the requesting client. We now

90 + send a message back to the browser to tell the user that they do

91 + not want to visit the URL via their browser, instead of a totally

92 + blank page.

93

94 + Expecting a reroll.

95 + Breaks its self tests.

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

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

98

339 -* lh/use-gnu-color-in-grep (2022-01-05) 1 commit

340 - (merged to 'next' on 2022-01-05 at a0e2068cb7)

341 - + grep: align default colors with GNU grep ones

99

343 - The color palette used by "git grep" has been updated to match that

344 - of GNU grep.

345 - source: <20220105081835.4949-1-lenaic@lhuard.fr>

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

101 + - fixup! editor: allow for saving/restoring terminal state

102 + - editor: allow for saving/restoring terminal state

103 + - terminal: teach save_term to fail when not foreground

104

105 + Some editors are reported to leave the terminal in funny state

106 + after they exit on Windows. Work it around by saving and restoring

107 + the terminal state when needed.

108

348 -* ma/header-dup-cleanup (2022-01-10) 1 commit

349 - (merged to 'next' on 2022-01-12 at de7891f5e8)

350 - + cache.h: drop duplicate `ensure_full_index()` declaration

109 + Expecting a reroll.

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

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

112

352 - Code clean-up.

353 - source: <20220110184134.18675-1-martin.agren@gmail.com>

113

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

115 + . submodule--helper: rename helper functions

116 + . submodule--helper: remove unused helpers

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

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

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

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

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

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

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

124

356 -* ma/windows-dynload-fix (2022-01-09) 1 commit

357 - (merged to 'next' on 2022-01-12 at af0a2e6c90)

358 - + lazyload: use correct calling conventions

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

126

360 - Fix calling dynamically loaded functions on Windows.

361 - source: <pull.1181.git.git.1641657750776.gitgitgadget@gmail.com>

127 + Expecting a reroll?

128 + cf. <YWiXL+plA7GHfuVv@google.com>

129 + source: <20211013051805.45662-10-raykar.ath@gmail.com>

130

131 +--------------------------------------------------

132 +[Cooking]

133

364 -* ms/t-readme-typofix (2022-01-04) 1 commit

365 - (merged to 'next' on 2022-01-06 at 59288ebb22)

366 - + t/README: fix typo

134 +* ds/sparse-checkout-requires-per-worktree-config (2022-01-14) 6 commits

135 + - worktree: copy sparse-checkout patterns and config on add

136 + - sparse-checkout: use repo_config_set_worktree_gently()

137 + - config: add repo_config_set_worktree_gently()

138 + - worktree: add 'init-worktree-config' subcommand

139 + - config: make some helpers repo-aware

140 + - setup: use a repository when upgrading format

141

368 - Typofix.

369 - source: <pull.1110.git.1641338224631.gitgitgadget@gmail.com>

142 + "git sparse-checkout" wants to work with per-worktree configration,

143 + but did not work well in a worktree attached to a bare repository.

144

145 + Expecting an update.

146 + cf. <1db0f601-4769-15c0-cd58-ecddfa1fc9d5@gmail.com>

147 + source: <pull.1101.v3.git.1640727143.gitgitgadget@gmail.com>

148

372 -* ps/lockfile-cleanup-fix (2022-01-07) 1 commit

373 - (merged to 'next' on 2022-01-10 at ff0ae63f07)

374 - + fetch: fix deadlock when cleaning up lockfiles in async signals

149

376 - Some lockfile code called free() in signal-death code path, which

377 - has been corrected.

378 - source: <555ec6717ecab0fe6ef5660bcf0d61d59f84ef8b.1641552500.git.ps@pks.im>

150 +* pw/add-p-hunk-split-fix (2022-01-12) 2 commits

151 + - builtin add -p: fix hunk splitting

152 + - t3701: clean up hunk splitting tests

153

154 + "git add -p" rewritten in C regressed hunk splitting in some cases,

155 + which has been corrected.

156

381 -* rb/nonstop-lacks-uncompress2 (2022-01-12) 1 commit

382 - (merged to 'next' on 2022-01-12 at 2387a47655)

383 - + build: NonStop ships with an older zlib

157 + Will merge to 'next'?

158 + source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>

159

385 - source: <xmqqzgo0u5j7.fsf@gitster.g>

160

161 +* gc/fetch-negotiate-only-early-return (2022-01-12) 3 commits

162 + - fetch --negotiate-only: do not update submodules

163 + - fetch: skip tasks related to fetching objects

164 + - fetch: use goto cleanup in cmd_fetch()

165

388 -* ws/fast-export-with-revision-options (2021-12-21) 1 commit

389 - (merged to 'next' on 2022-01-03 at f94f7f70b6)

390 - + fast-export: fix surprising behavior with --first-parent

166 + "git fetch --nogotiate-only" is an internal command used by "git

167 + push" to figure out which part of our history is missing from the

168 + other side. It should never recurse into submodules even when

169 + fetch.recursesubmodules configuration variable is set, nor it

170 + should trigger "gc". The code has been tightened up to ensure it

171 + only does common ancestry discovery and nothing else.

172

392 - Use of certain "git rev-list" options with "git fast-export"

393 - created nonsense results (the worst two of which being "--reverse"

394 - and "--invert-grep --grep=<foo>"). The use of "--first-parent" is

395 - made to behave a bit more sensible than before.

396 - source: <pull.1084.v2.git.1639037637231.gitgitgadget@gmail.com>

173 + Almost there.

174 + source: <20220113004501.78822-1-chooglen@google.com>

175

398 ---------------------------------------------------

399 -[New Topics]

176

177 * jh/p4-fix-use-of-process-error-exception (2022-01-06) 1 commit

178 (merged to 'next' on 2022-01-10 at 49d529bfd7)

@@ -416,15 +192,16 @@ Release tarballs are available at:

192 source: <20220106214035.90725-1-jholdsworth@nvidia.com>

193

194

419 -* pb/pull-rebase-autostash-fix (2022-01-06) 1 commit

420 - - pull --rebase: honor rebase.autostash even when fast-forwarding

195 +* pb/pull-rebase-autostash-fix (2022-01-14) 1 commit

196 + (merged to 'next' on 2022-01-14 at 83a388a7e2)

197 + + pull --rebase: honor rebase.autostash when fast-forwarding

198

199 "git pull --rebase" ignored the rebase.autostash configuration

200 variable when the remote history is a descendant of our history,

201 which has been corrected.

202

426 - Expecting an ack or two.

427 - source: <4fe0e850-1c30-da70-5535-e2a4105ba734@gmail.com>

203 + Will cook in 'next'.

204 + source: <xmqqr19aayxp.fsf@gitster.g>

205

206

207 * rs/grep-expr-cleanup (2022-01-06) 4 commits

@@ -465,20 +242,20 @@ Release tarballs are available at:

242

243

244 * ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-12) 7 commits

468 - - fixup! refs: open-code deletion of packed refs

469 - - refs: skip hooks when deleting uncovered packed refs

470 - - refs: do not execute reference-transaction hook on packing refs

471 - - refs: demonstrate excessive execution of the reference-transaction hook

472 - - refs: allow skipping the reference-transaction hook

473 - - refs: allow passing flags when beginning transactions

474 - - refs: open-code deletion of packed refs

245 + . fixup! refs: open-code deletion of packed refs

246 + . refs: skip hooks when deleting uncovered packed refs

247 + . refs: do not execute reference-transaction hook on packing refs

248 + . refs: demonstrate excessive execution of the reference-transaction hook

249 + . refs: allow skipping the reference-transaction hook

250 + . refs: allow passing flags when beginning transactions

251 + . refs: open-code deletion of packed refs

252

253 Because a deletion of ref would need to remove it from both the

254 loose ref store and the packed ref store, a delete-ref operation

255 that logically removes one ref may end up invoking ref-transaction

256 hook twice, which has been corrected.

257

481 - Under review.

258 + Introduces new leaks when merged to 'seen'.

259 source: <cover.1641556319.git.ps@pks.im>

260

261

@@ -522,138 +299,20 @@ Release tarballs are available at:

299 source: <20220111213941.30129-1-jerry@skydio.com>

300

301

525 -* ab/refs-errno-cleanup (2022-01-13) 1 commit

526 - - refs API: use "failure_errno", not "errno"

527 -

528 - A brown-paper-bag fix on top of a topic that was merged during this

529 - cycle.

530 -

531 - Will merge to 'next' and then to 'master'.

532 - source: <patch-v3-1.3-a45268ac24b-20220112T123117Z-avarab@gmail.com>

533 -

534 -

535 -* ab/reftable-build-fixes (2022-01-13) 2 commits

536 - - reftable tests: avoid "int" overflow, use "uint64_t"

537 - - reftable: avoid initializing structs from structs

538 -

539 - A few portability tweaks.

540 -

541 - Will merge to 'next' and then to 'master'?

542 - source: <cover-0.3-00000000000-20220111T163908Z-avarab@gmail.com>

543 -

544 -

545 -* en/present-despite-skipped (2022-01-13) 6 commits

546 - . Accelerate clear_skip_worktree_from_present_files() by caching

547 - . Update documentation related to sparsity and the skip-worktree bit

548 - . repo_read_index: clear SKIP_WORKTREE bit from files present in worktree

549 - . unpack-trees: fix accidental loss of user changes

550 - . t1011: add testcase demonstrating accidental loss of user modifications

551 - . Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped

302 +* en/present-despite-skipped (2022-01-14) 6 commits

303 + - Accelerate clear_skip_worktree_from_present_files() by caching

304 + - Update documentation related to sparsity and the skip-worktree bit

305 + - repo_read_index: clear SKIP_WORKTREE bit from files present in worktree

306 + - unpack-trees: fix accidental loss of user changes

307 + - t1011: add testcase demonstrating accidental loss of user modifications

308 + - Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped

309 (this branch uses vd/sparse-clean-etc.)

310

554 - With this topic merged, 'seen' seems to fail t1092.

555 - source: <pull.1114.git.1642092230.gitgitgadget@gmail.com>

556 -

557 -

558 -* js/t1450-making-it-writable-does-not-need-full-posixperm (2022-01-13) 1 commit

559 - - t1450-fsck: exec-bit is not needed to make loose object writable

560 -

561 - Test fix.

562 -

563 - Will merge to 'next'.

564 - source: <529d99f3-13c8-ffc1-dd4c-3fc70330262a@kdbg.org>

565 -

566 ---------------------------------------------------

567 -[Stalled]

568 -

569 -* ds/sparse-checkout-requires-per-worktree-config (2021-12-21) 5 commits

570 - . sparse-checkout: use repo_config_set_worktree_gently()

571 - . config: add repo_config_set_worktree_gently()

572 - . worktree: add upgrade_to_worktree_config()

573 - . config: make some helpers repo-aware

574 - . setup: use a repository when upgrading format

575 -

576 - "git sparse-checkout" wants to work with per-worktree configration,

577 - but did not work well in a worktree attached to a bare repository.

578 - source: <pull.1101.v2.git.1640114048.gitgitgadget@gmail.com>

579 -

311 + (NEEDSWORK: BY DOING WHAT), cope better with files on the working

312 + tree that should not exist according to the sparse checkout

313 + settings.

314 + source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>

315

581 -* pw/add-p-hunk-split-fix (2022-01-12) 2 commits

582 - - builtin add -p: fix hunk splitting

583 - - t3701: clean up hunk splitting tests

584 -

585 - "git add -p" rewritten in C regressed hunk splitting in some cases,

586 - which has been corrected.

587 -

588 - Will merge to 'next'?

589 - source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>

590 -

591 -

592 -* gc/fetch-negotiate-only-early-return (2022-01-12) 3 commits

593 - - fetch --negotiate-only: do not update submodules

594 - - fetch: skip tasks related to fetching objects

595 - - fetch: use goto cleanup in cmd_fetch()

596 -

597 - "git fetch --nogotiate-only" is an internal command used by "git

598 - push" to figure out which part of our history is missing from the

599 - other side. It should never recurse into submodules even when

600 - fetch.recursesubmodules configuration variable is set, nor it

601 - should trigger "gc". The code has been tightened up to ensure it

602 - only does common ancestry discovery and nothing else.

603 -

604 - Almost there.

605 - source: <20220113004501.78822-1-chooglen@google.com>

606 -

607 -

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

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

610 -

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

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

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

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

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

616 - blank page.

617 -

618 - Expecting a reroll.

619 - Breaks its self tests.

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

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

622 -

623 -

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

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

626 - - editor: allow for saving/restoring terminal state

627 - - terminal: teach save_term to fail when not foreground

628 -

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

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

631 - the terminal state when needed.

632 -

633 - Expecting a reroll.

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

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

636 -

637 -

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

639 - . submodule--helper: rename helper functions

640 - . submodule--helper: remove unused helpers

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

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

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

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

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

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

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

648 -

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

650 -

651 - Expecting a reroll?

652 - cf. <YWiXL+plA7GHfuVv@google.com>

653 - source: <20211013051805.45662-10-raykar.ath@gmail.com>

654 -

655 ---------------------------------------------------

656 -[Cooking]

316

317 * bc/csprng-mktemps (2022-01-04) 2 commits

318 - wrapper: use a CSPRNG to generate random file names

@@ -696,15 +355,16 @@ Release tarballs are available at:

355

356

357 * ms/update-index-racy (2022-01-07) 4 commits

699 - - update-index: refresh should rewrite index in case of racy timestamps

700 - - t7508: add tests capturing racy timestamp handling

701 - - t7508: fix bogus mtime verification

702 - - test-lib: introduce API for verifying file mtime

358 + (merged to 'next' on 2022-01-14 at 705a33f63b)

359 + + update-index: refresh should rewrite index in case of racy timestamps

360 + + t7508: add tests capturing racy timestamp handling

361 + + t7508: fix bogus mtime verification

362 + + test-lib: introduce API for verifying file mtime

363

364 "git update-index --refresh" has been taught to deal better with

365 racy timestamps (just like "git status" already does).

366

707 - Will merge to 'next'.

367 + Will cook in 'next'.

368 source: <pull.1105.v4.git.1641554252.gitgitgadget@gmail.com>

369

370

@@ -923,9 +583,9 @@ Release tarballs are available at:

583 source: <cover-v7-0.6-00000000000-20220111T130811Z-avarab@gmail.com>

584

585

926 -* tl/ls-tree-oid-only (2022-01-06) 9 commits

927 - - cocci: allow padding with `strbuf_addf()`

586 +* tl/ls-tree-oid-only (2022-01-13) 9 commits

587 - ls-tree.c: introduce "--format" option

588 + - cocci: allow padding with `strbuf_addf()`

589 - ls-tree.c: introduce struct "show_tree_data"

590 - ls-tree.c: support --object-only option for "git-ls-tree"

591 - ls-tree: optimize naming and handling of "return" in show_tree()

@@ -936,7 +596,7 @@ Release tarballs are available at:

596

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

598 and more generalized "--format" option.

939 - source: <cover.1641440700.git.dyroneteng@gmail.com>

599 + source: <cover.1641978175.git.dyroneteng@gmail.com>

600

601

602 * ab/config-based-hooks-2 (2022-01-07) 17 commits

What's cooking (2022/01 #04)