72d66dab9f · 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 (Feb 2022, #02; Wed, 9)

4 -X-master-at: 2b9c1209706bc2ef0ab09fb0bdc7d405e225ce8b

5 -X-next-at: b22f109932d866f1f13b0e1a07d0c3b42268a14f

3 +Subject: What's cooking in git.git (Feb 2022, #03; Sat, 12)

4 +X-master-at: b80121027d1247a0754b3cc46897fee75c050b44

5 +X-next-at: 83b2b277ed60276e529455a66ea1f50a6e513b26

6

7 -What's cooking in git.git (Feb 2022, #02; Wed, 9)

7 +What's cooking in git.git (Feb 2022, #03; Sat, 12)

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

9

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

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

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

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

20

21 -The second batch of topics have been merged.

21 +The third batch of topics have been merged.

22

23 Many new topics have sketchy or even empty topic description in the

24 list below; help to fill them in is very much appreciated ;-)

@@ -54,306 +54,258 @@ Release tarballs are available at:

54 --------------------------------------------------

55 [Graduated to 'master']

56

57 -* ab/cat-file (2022-01-12) 12 commits

58 - (merged to 'next' on 2022-01-12 at ee4d43041d)

59 - + cat-file: s/_/-/ in typo'd usage_msg_optf() message

60 - + cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output

61 - (merged to 'next' on 2022-01-05 at e145efa605)

62 - + cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)

63 - + object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY

64 - + cat-file: correct and improve usage information

65 - + cat-file: fix remaining usage bugs

66 - + cat-file: make --batch-all-objects a CMDMODE

67 - + cat-file: move "usage" variable to cmd_cat_file()

68 - + cat-file docs: fix SYNOPSIS and "-h" output

69 - + parse-options API: add a usage_msg_optf()

70 - + cat-file tests: test messaging on bad objects/paths

71 - + cat-file tests: test bad usage

72 -

73 - Assorted updates to "git cat-file", especially "-h".

74 - source: <cover-v6-00.10-00000000000-20211228T132637Z-avarab@gmail.com>

75 - source: <cover-0.2-00000000000-20220110T220553Z-avarab@gmail.com>

76 -

77 -

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

79 - (merged to 'next' on 2022-01-19 at 594b6da22c)

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

81 - + receive-pack: convert push-to-checkout hook to hook.h

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

83 - + commit: convert {pre-commit,prepare-commit-msg} hook to hook.h

84 - + git-p4: use 'git hook' to run hooks

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

86 - + git hook run: add an --ignore-missing flag

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

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

89 - + merge: convert post-merge to use hook.h

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

91 - + rebase: convert pre-rebase to use hook.h

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

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

94 - + gc: use hook library for pre-auto-gc hook

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

96 - + hook: add 'run' subcommand

97 -

98 - More "config-based hooks".

99 - source: <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>

100 -

101 -

102 -* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit

103 - (merged to 'next' on 2022-01-19 at 84da10b057)

104 - + merge-ort: avoid assuming all renames detected

105 -

106 - The merge-ort misbehaved when merge.renameLimit configuration is

107 - set too low and failed to find all renames.

108 - source: <pull.1194.v2.git.git.1642443955836.gitgitgadget@gmail.com>

109 -

110 -

111 -* en/plug-leaks-in-merge (2022-01-21) 2 commits

112 - (merged to 'next' on 2022-01-26 at 0cf6aa0a2b)

113 - + merge: fix memory leaks in cmd_merge()

114 - + merge-ort: fix memory leak in merge_ort_internal()

57 +* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits

58 + (merged to 'next' on 2022-02-04 at d98254efe0)

59 + + refs API: remove "failure_errno" from refs_resolve_ref_unsafe()

60 + + sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure

61

116 - Leakfix.

117 - source: <pull.1200.git.git.1642664835.gitgitgadget@gmail.com>

62 + Remaining code-clean-up.

63 + source: <cover-v4-0.2-00000000000-20220126T143427Z-avarab@gmail.com>

64

65

120 -* fs/ssh-signing-crlf (2022-01-07) 1 commit

121 - (merged to 'next' on 2022-01-19 at 76b86faafb)

122 - + gpg-interface: trim CR from ssh-keygen

66 +* bc/clarify-eol-attr (2022-01-12) 2 commits

67 + (merged to 'next' on 2022-02-04 at dc1db4bd21)

68 + + docs: correct documentation about eol attribute

69 + + t0027: add tests for eol without text in .gitattributes

70

124 - The code path that verifies signatures made with ssh were made to

125 - work better on a system with CRLF line endings.

126 - source: <20220107090735.580225-1-fs@gigacodes.de>

71 + Doc and test update around the eol attribute.

72 + source: <20220111021507.531736-1-sandals@crustytoothpaste.net>

73

74

129 -* gc/fetch-negotiate-only-early-return (2022-01-20) 4 commits

130 - (merged to 'next' on 2022-01-20 at e7616428eb)

131 - + fetch: help translators by reusing the same message template

132 - (merged to 'next' on 2022-01-19 at 0f15147cfa)

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

134 - + fetch: skip tasks related to fetching objects

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

75 +* bc/csprng-mktemps (2022-01-17) 2 commits

76 + (merged to 'next' on 2022-02-04 at 2e32375c73)

77 + + wrapper: use a CSPRNG to generate random file names

78 + + wrapper: add a helper to generate numbers from a CSPRNG

79

137 - "git fetch --negotiate-only" is an internal command used by "git

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

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

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

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

142 - only does common ancestry discovery and nothing else.

143 - source: <20220119000056.58503-1-chooglen@google.com>

80 + Pick a better random number generator and use it when we prepare

81 + temporary filenames.

82 + source: <20220117215617.843190-1-sandals@crustytoothpaste.net>

83

84

146 -* jc/find-header (2022-01-06) 1 commit

147 - (merged to 'next' on 2022-01-10 at 8a13b4f0b3)

148 - + receive-pack.c: consolidate find header logic

85 +* en/sparse-checkout-leakfix (2022-01-28) 1 commit

86 + (merged to 'next' on 2022-02-04 at 10ca176008)

87 + + sparse-checkout: fix a couple minor memory leaks

88

150 - Code clean-up.

151 - source: <pull.1125.v6.git.git.1641499655700.gitgitgadget@gmail.com>

89 + Leakfix.

90 + source: <pull.1189.git.git.1643335098710.gitgitgadget@gmail.com>

91

92

154 -* jc/mem-pool-alignment (2022-01-24) 1 commit

155 - (merged to 'next' on 2022-01-26 at 057b6a78f5)

156 - + mem-pool: don't assume uintmax_t is aligned enough for all types

93 +* gh/doc-typos (2022-01-26) 2 commits

94 + (merged to 'next' on 2022-02-04 at b71e1bc746)

95 + + Documentation/config/pgp.txt: add missing apostrophe

96 + + Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>

97

158 - Update the logic to compute alignment requirement for our mem-pool.

159 - source: <20220123203347.74869-1-jrtc27@jrtc27.com>

98 + Typofix.

99 + source: <20220126121426.53799-1-greg@hurrell.net>

100

101

162 -* jc/name-rev-stdin (2022-01-10) 2 commits

163 - (merged to 'next' on 2022-01-19 at a58e05fabe)

164 - + name-rev.c: use strbuf_getline instead of limited size buffer

165 - + name-rev: deprecate --stdin in favor of --annotate-stdin

102 +* jc/doc-log-messages (2022-01-27) 3 commits

103 + (merged to 'next' on 2022-02-04 at cf136572ce)

104 + + SubmittingPatches: explain why we care about log messages

105 + + CodingGuidelines: hint why we value clearly written log messages

106 + + SubmittingPatches: write problem statement in the log in the present tense

107

167 - "git name-rev --stdin" does not behave like usual "--stdin" at

168 - all. Start the process of renaming it to "--annotate-stdin".

169 - source: <pull.1171.v7.git.git.1641425372.gitgitgadget@gmail.com>

108 + Update the contributor-facing documents on proposed log messages.

109 + source: <20220126234205.2923388-1-gitster@pobox.com>

110

111

172 -* jc/qsort-s-alignment-fix (2022-01-07) 2 commits

173 - (merged to 'next' on 2022-01-10 at 329fd6e09a)

174 - + stable-qsort: avoid using potentially unaligned access

175 - + compat/qsort_s.c: avoid using potentially unaligned access

112 +* rc/negotiate-only-typofix (2022-01-28) 1 commit

113 + (merged to 'next' on 2022-02-04 at 62b947ddbf)

114 + + fetch: fix negotiate-only error message

115

177 - Fix a hand-rolled alloca() imitation that may have violated

178 - alignment requirement of data being sorted in compatibility

179 - implementation of qsort_s() and stable qsort().

180 - source: <f40c1b47-9aad-2dcc-ceeb-5dee2b517cd8@web.de>

181 - source: <xmqqzgo76xpj.fsf@gitster.g>

116 + Typofix.

117 + source: <20220128143602.31842-1-robert@coup.net.nz>

118

119

184 -* jc/reflog-parse-options (2022-01-10) 2 commits

185 - (merged to 'next' on 2022-01-12 at 1659e49c4b)

186 - + builtin/reflog.c: use parse-options api for expire, delete subcommands

187 - + Merge branch 'ab/reflog-prep' into jc/reflog-parse-options

120 +* rs/parse-options-lithelp-help (2022-01-20) 1 commit

121 + (merged to 'next' on 2022-02-04 at 74bc57e8fa)

122 + + parse-options: document bracketing of argh

123

189 - Use the parse-options API in "git reflog" command.

190 - source: <pull.1175.v5.git.git.1641495981650.gitgitgadget@gmail.com>

124 + Comment update.

125 + source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>

126

127

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

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

195 - + git-p4: fix instantiation of CalledProcessError

196 - (this branch is used by jh/p4-various-fixups.)

128 +* sy/diff-usage-typofix (2022-02-02) 1 commit

129 + (merged to 'next' on 2022-02-04 at 28a4186a44)

130 + + builtin/diff.c: fix "git-diff" usage string typo

131

198 - source: <20220106214156.90967-1-jholdsworth@nvidia.com>

132 + Typofix.

133 + source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>

134

135

201 -* jh/p4-spawning-external-commands-cleanup (2022-01-06) 3 commits

202 - (merged to 'next' on 2022-01-10 at 54b36b4e66)

203 - + git-p4: don't print shell commands as python lists

204 - + git-p4: pass command arguments as lists instead of using shell

205 - + git-p4: don't select shell mode using the type of the command argument

206 - (this branch is used by jh/p4-various-fixups.)

136 +* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit

137 + (merged to 'next' on 2022-02-04 at 8af6ab286d)

138 + + fetch --prune: exit with error if pruning fails

139

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

140 + When "git fetch --prune" failed to prune the refs it wanted to

141 + prune, the command issued error messages but exited with exit

142 + status 0, which has been corrected.

143 + source: <20220131133047.1885074-1-t.gummerer@gmail.com>

144

145 +--------------------------------------------------

146 +[New Topics]

147

211 -* js/sparse-vs-split-index (2022-01-23) 3 commits

212 - (merged to 'next' on 2022-01-26 at 7443487955)

213 - + split-index: it really is incompatible with the sparse index

214 - + t1091: disable split index

215 - + sparse-index: sparse index is disallowed when split index is active

148 +* jc/glossary-worktree (2022-02-09) 1 commit

149 + (merged to 'next' on 2022-02-10 at d05e2b6ea3)

150 + + glossary: describe "worktree"

151

217 - Mark in various places in the code that the sparse index and the

218 - split index features are mutually incompatible.

219 - source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>

152 + "working tree" and "per-worktree ref" were in glossary, but

153 + "worktree" itself wasn't, which has been corrected.

154

155 + Will merge to 'master'.

156 + source: <xmqqczjvxy3o.fsf@gitster.g>

157

222 -* js/test-unset-trace2-parents (2022-01-20) 1 commit

223 - (merged to 'next' on 2022-01-20 at ebb085e3e4)

224 - + test-lib: unset trace2 parent envvars

158

226 - Avoid tests that are run under GIT_TRACE2 set from failing

227 - unnecessarily.

228 - source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>

159 +* jd/t0015-modernize (2022-02-09) 1 commit

160 + (merged to 'next' on 2022-02-10 at a3733234c0)

161 + + t/t0015-hash.sh: remove unnecessary '\' at line end

162

163 + Test modernization.

164

231 -* jt/clone-not-quite-empty (2022-01-26) 1 commit

232 - (merged to 'next' on 2022-01-26 at c3bb39676e)

233 - + clone: support unusual remote ref configurations

165 + Will merge to 'master'.

166 + source: <20220208092339.651761-2-jaydeepjd.8914@gmail.com>

167

235 - Cloning from a repository that does not yet have any branches or

236 - tags but has other refs resulted in a "remote transport reported

237 - error", which has been corrected.

238 - source: <20220124180909.2437002-1-jonathantanmy@google.com>

168

169 +* hw/t1410-adjust-test-for-reftable (2022-02-09) 2 commits

170 + - t1410: mark bufsize boundary test as REFFILES

171 + - t1410: use test-tool ref-store to inspect reflogs

172

241 -* jt/conditional-config-on-remote-url (2022-01-18) 2 commits

242 - (merged to 'next' on 2022-01-19 at 3c2df266eb)

243 - + config: include file if remote URL matches a glob

244 - + config: make git_config_include() static

173 + Fix tests that are unnecessarily specific to ref-files backend.

174

246 - The conditional inclusion mechanism of configuration files using

247 - "[includeIf <condition>]" learns to base its decision on the

248 - URL of the remote repository the repository interacts with.

249 - source: <cover.1642527965.git.jonathantanmy@google.com>

175 + Will merge to 'next'.

176 + source: <pull.1213.git.git.1644406180.gitgitgadget@gmail.com>

177

178

252 -* jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit

253 - (merged to 'next' on 2022-01-26 at 5611ce9047)

254 - + sparse-checkout: create leading directory

179 +* ps/fetch-optim-with-commit-graph (2022-02-10) 2 commits

180 + - fetch: skip computing output width when not printing anything

181 + - fetch-pack: use commit-graph when computing cutoff

182

256 - "git sparse-checkout init" failed to write into $GIT_DIR/info

257 - directory when the repository was created without one, which has

258 - been corrected to auto-create it.

259 - source: <20220121174441.3991963-1-jonathantanmy@google.com>

183 + A couple of optimization to "git fetch".

184

185 + Will merge to 'next'.

186 + source: <cover.1644495978.git.ps@pks.im>

187

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

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

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

265 - + t7508: add tests capturing racy timestamp handling

266 - + t7508: fix bogus mtime verification

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

188

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

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

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

189 +* pw/xdiff-alloc-fail (2022-02-09) 3 commits

190 + - xdiff: handle allocation failure when merging

191 + - xdiff: refactor a function

192 + - xdiff: handle allocation failure in patience diff

193

194 + Expecting a reroll.

195 + cf. <9c5b3acb-aabc-3a0d-f4e7-e10cec410dbe@gmail.com>

196 + source: <pull.1140.git.1644404356.gitgitgadget@gmail.com>

197

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

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

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

198

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

279 - variable when the remote history is a descendant of our history,

280 - which has been corrected.

281 - source: <xmqqr19aayxp.fsf@gitster.g>

199 +* sy/t0001-use-path-is-helper (2022-02-11) 1 commit

200 + - t0001: replace "test [-d|-f]" with test_path_is_* functions

201

202 + Test modernization.

203

284 -* po/readme-mention-contributor-hints (2022-01-17) 1 commit

285 - (merged to 'next' on 2022-01-19 at 7e14690eb9)

286 - + README.md: add CodingGuidelines and a link for Translators

204 + Will merge to 'next'.

205 + source: <20220121102109.433457-2-shaoxuan.yuan02@gmail.com>

206

288 - Doc update.

289 - source: <pull.1115.v3.git.1642443491609.gitgitgadget@gmail.com>

207

208 +* gc/recursive-fetch-with-unused-submodules (2022-02-10) 8 commits

209 + - submodule: fix bug and remove add_submodule_odb()

210 + - fetch: fetch unpopulated, changed submodules

211 + - submodule: extract get_fetch_task()

212 + - t5526: use grep to assert on fetches

213 + - t5526: introduce test helper to assert on fetches

214 + - submodule: make static functions read submodules from commits

215 + - submodule: store new submodule commits oid_array in a struct

216 + - submodule: inline submodule_commits() into caller

217

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

293 - (merged to 'next' on 2022-01-19 at ea57b2c9a6)

294 - + builtin add -p: fix hunk splitting

295 - + t3701: clean up hunk splitting tests

218 + When "git fetch --recurse-submodules" grabbed submodule commits

219 + that would be needed to recursively check out newly fetched commits

220 + in the superproject, it only paid attention to submodules that are

221 + in the current checkout of the superproject. We now do so for all

222 + submodules that have been run "git submodule init" on.

223

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

298 - which has been corrected.

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

224 + Will merge to 'next'?

225 + source: <20220210044152.78352-1-chooglen@google.com>

226

227

302 -* rs/apply-symlinks-use-strset (2022-01-07) 1 commit

303 - (merged to 'next' on 2022-01-10 at 32497a67d5)

304 - + apply: use strsets to track symlinks

228 +* ah/log-no-graph (2022-02-11) 2 commits

229 + - log: add a --no-graph option

230 + - log: fix memory leak if --graph is passed multiple times

231

306 - "git apply" (ab)used the util pointer of the string-list to keep

307 - track of how each symbolic link needs to be handled, which has been

308 - simplified by using strset.

309 - source: <8739caad-aa3d-1f0f-b5dd-6174a8e059f6@web.de>

232 + "git log --graph --graph" used to leak a graph structure, and there

233 + was no way to countermand "--graph" that appear earlier on the

234 + command line. A "--no-graph" option has been added and resource

235 + leakage lhas been plugged.

236 +

237 + Will merge to 'next'.

238 + source: <20220211163627.598166-2-alexhenrie24@gmail.com>

239

240

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

313 - (merged to 'next' on 2022-01-10 at b70a3bb0fa)

314 - + grep: use grep_and_expr() in compile_pattern_and()

315 - + grep: extract grep_binexp() from grep_or_expr()

316 - + grep: use grep_not_expr() in compile_pattern_not()

317 - + grep: use grep_or_expr() in compile_pattern_or()

241 +* cg/t3903-modernize (2022-02-11) 1 commit

242 + - t/t3903-stash.sh: replace test [-d|-f] with test_path_is_*

243 +

244 + Test modernization.

245 +

246 + Will merge to 'next'?

247 + source: <20220211134655.1149320-1-cogoni.guillaume@gmail.com>

248 +

249 +--------------------------------------------------

250 +[Stalled]

251 +

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

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

254 +

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

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

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

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

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

260 + blank page.

261 +

262 + Expecting a reroll.

263 + Breaks its self tests.

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

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

266

319 - Code clean-up.

320 - source: <cover.1641498525.git.me@ttaylorr.com>

267

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

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

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

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

272

323 -* tl/doc-cli-options-first (2022-01-17) 1 commit

324 - (merged to 'next' on 2022-01-19 at 9ec14cfe73)

325 - + git-cli.txt: clarify "options first and then args"

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

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

275 + the terminal state when needed.

276

327 - We explain that revs come first before the pathspec among command

328 - line arguments, but did not spell out that dashed options come

329 - before other args, which has been corrected.

330 - source: <fe748304d94e0ae25fd3549aadc49cf951ff2d64.1642405806.git.dyroneteng@gmail.com>

277 + Expecting a reroll.

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

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

280

281 --------------------------------------------------

333 -[New Topics]

282 +[Cooking]

283

284 * ab/t0051-skip-on-non-windows (2022-02-04) 1 commit

336 - - t0051: use "skip_all" under !MINGW in single-test file

285 + (merged to 'next' on 2022-02-10 at 3e587df1d6)

286 + + t0051: use "skip_all" under !MINGW in single-test file

287

288 Conditional test update.

289

340 - Will merge to 'next'.

290 + Will merge to 'master'.

291 source: <patch-v2-1.1-1bc93bcba4b-20220204T134208Z-avarab@gmail.com>

292

293

294 * ab/hash-object-leakfix (2022-02-06) 1 commit

345 - - hash-object: fix a trivial leak in --path

295 + (merged to 'next' on 2022-02-10 at 14956d3087)

296 + + hash-object: fix a trivial leak in --path

297

298 Trivial leakfix.

299

349 - Will merge to 'next'.

300 + Will merge to 'master'.

301 source: <patch-1.1-53863df1455-20220205T000422Z-avarab@gmail.com>

302

303

304 * ab/release-transport-ls-refs-options (2022-02-06) 1 commit

354 - - ls-remote & transport API: release "struct transport_ls_refs_options"

305 + (merged to 'next' on 2022-02-10 at c4e57c2b29)

306 + + ls-remote & transport API: release "struct transport_ls_refs_options"

307

356 - Will merge to 'next'.

308 + Will merge to 'master'.

309 source: <patch-1.1-e80e8f64eae-20220205T000809Z-avarab@gmail.com>

310

311

@@ -386,73 +338,46 @@ Release tarballs are available at:

338

339

340 * js/short-help-outside-repo-fix (2022-02-08) 2 commits

389 - - t0012: verify that built-ins handle `-h` even without gitdir

390 - - checkout/fetch/pull/pack-objects: allow `-h` outside a repository

341 + (merged to 'next' on 2022-02-10 at a86376de89)

342 + + t0012: verify that built-ins handle `-h` even without gitdir

343 + + checkout/fetch/pull/pack-objects: allow `-h` outside a repository

344

345 "git cmd -h" outside a repository should error out cleanly for many

346 commands, but instead it hit a BUG(), which has been corrected.

347

395 - Will merge to 'next'.

348 + Will merge to 'master'.

349 source: <pull.1139.v2.git.1644319314.gitgitgadget@gmail.com>

350

351

352 * tb/midx-no-bitmap-for-no-objects (2022-02-09) 1 commit

400 - - midx: prevent writing a .bitmap without any objects

353 + (merged to 'next' on 2022-02-10 at 5c501a3f80)

354 + + midx: prevent writing a .bitmap without any objects

355

356 When there is no object to write .bitmap file for, "git

357 multi-pack-index" triggered an error, instead of just skipping,

358 which has been corrected.

359

406 - Will merge to 'next'.

360 + Will merge to 'master'.

361 source: <abc67d757cb6b244cf54b7b030985180ce134724.1644434802.git.me@ttaylorr.com>

362

363

410 -* jc/cat-file-batch-commands (2022-02-08) 3 commits

411 - . cat-file: add --batch-command mode

412 - . cat-file: introduce batch_command enum to replace print_contents

413 - . cat-file: rename cmdmode to transform_mode

414 -

415 -

416 - Seems to make tests hang.

417 - source: <pull.1212.v3.git.git.1644353884.gitgitgadget@gmail.com>

418 -

419 ---------------------------------------------------

420 -[Stalled]

421 -

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

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

424 -

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

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

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

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

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

430 - blank page.

431 -

432 - Expecting a reroll.

433 - Breaks its self tests.

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

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

436 -

437 -

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

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

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

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

364 +* jc/cat-file-batch-commands (2022-02-11) 3 commits

365 + - cat-file: add --batch-command mode

366 + - cat-file: introduce batch_mode enum to replace print_contents

367 + - cat-file: rename cmdmode to transform_mode

368

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

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

445 - the terminal state when needed.

369 + "git cat-file" learns "--batch-command" mode, which is a more

370 + flexible interface than the existing "--batch" or "--batch-check"

371 + modes, to allow different kinds of inquiries made.

372 + source: <pull.1212.v5.git.git.1644609683.gitgitgadget@gmail.com>

373

447 - Expecting a reroll.

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

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

450 -

451 ---------------------------------------------------

452 -[Cooking]

374

454 -* ar/submodule-update (2022-02-08) 16 commits

375 +* ar/submodule-update (2022-02-10) 20 commits

376 + . fixup! submodule: move core cmd_update() logic to C

377 + . fixup! submodule--helper run-update-procedure: learn --remote

378 + . fixup! submodule--helper run-update-procedure: remove --suboid

379 . submodule: move core cmd_update() logic to C

380 + . submodule--helper: reduce logic in run_update_procedure()

381 . submodule--helper: move functions around

382 . submodule--helper update-clone: learn --init

383 . submodule--helper: remove ensure-core-worktree

@@ -471,66 +396,34 @@ Release tarballs are available at:

396

397 Rewrite of "git submodule update" in C.

398

474 - Does not seem to play well with other topics in flight.

475 - source: <20220208083952.35036-1-chooglen@google.com>

399 + Does not seem to play well with other topics in flight, with heavy conflicts.

400 + cf. <xmqqv8xj71mt.fsf@gitster.g>

401 + source: <20220210092833.55360-1-chooglen@google.com>

402

403

404 * pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits

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

480 - - rebase --apply: set ORIG_HEAD correctly

481 - - rebase --apply: fix reflog

482 - - reset_head(): take struct rebase_head_opts

483 - - rebase: cleanup reset_head() calls

484 - - create_autostash(): remove unneeded parameter

485 - - reset_head(): make default_reflog_action optional

486 - - reset_head(): factor out ref updates

487 - - reset_head(): remove action parameter

488 - - rebase --apply: don't run post-checkout hook if there is an error

489 - - rebase: do not remove untracked files on checkout

490 - - rebase: pass correct arguments to post-checkout hook

491 - - t5403: refactor rebase post-checkout hook tests

492 - - rebase: factor out checkout for up to date branch

405 + (merged to 'next' on 2022-02-10 at bd7c3615fe)

406 + + rebase -m: don't fork git checkout

407 + + rebase --apply: set ORIG_HEAD correctly

408 + + rebase --apply: fix reflog

409 + + reset_head(): take struct rebase_head_opts

410 + + rebase: cleanup reset_head() calls

411 + + create_autostash(): remove unneeded parameter

412 + + reset_head(): make default_reflog_action optional

413 + + reset_head(): factor out ref updates

414 + + reset_head(): remove action parameter

415 + + rebase --apply: don't run post-checkout hook if there is an error

416 + + rebase: do not remove untracked files on checkout

417 + + rebase: pass correct arguments to post-checkout hook

418 + + t5403: refactor rebase post-checkout hook tests

419 + + rebase: factor out checkout for up to date branch

420

421 Use an internal call to reset_head() helper function instead of

422 spawning "git checkout" in "rebase", and update code paths that are

423 involved in the change.

424

498 - Will merge to 'next'.

499 - source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>

500 -

501 -

502 -* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits

503 - (merged to 'next' on 2022-02-04 at d98254efe0)

504 - + refs API: remove "failure_errno" from refs_resolve_ref_unsafe()

505 - + sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure

506 -

507 - Remaining code-clean-up.

508 -

509 - Will merge to 'master'.

510 - source: <cover-v4-0.2-00000000000-20220126T143427Z-avarab@gmail.com>

511 -

512 -

513 -* gh/doc-typos (2022-01-26) 2 commits

514 - (merged to 'next' on 2022-02-04 at b71e1bc746)

515 - + Documentation/config/pgp.txt: add missing apostrophe

516 - + Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>

517 -

518 - Typofix.

519 -

425 Will merge to 'master'.

521 - source: <20220126121426.53799-1-greg@hurrell.net>

522 -

523 -

524 -* jc/doc-log-messages (2022-01-27) 3 commits

525 - (merged to 'next' on 2022-02-04 at cf136572ce)

526 - + SubmittingPatches: explain why we care about log messages

527 - + CodingGuidelines: hint why we value clearly written log messages

528 - + SubmittingPatches: write problem statement in the log in the present tense

529 -

530 - Update the contributor-facing documents on proposed log messages.

531 -

532 - Will merge to 'master'.

533 - source: <20220126234205.2923388-1-gitster@pobox.com>

426 + source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>

427

428

429 * en/fetch-negotiation-default-fix (2022-02-02) 3 commits

@@ -546,16 +439,6 @@ Release tarballs are available at:

439 source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>

440

441

549 -* en/sparse-checkout-leakfix (2022-01-28) 1 commit

550 - (merged to 'next' on 2022-02-04 at 10ca176008)

551 - + sparse-checkout: fix a couple minor memory leaks

552 -

553 - Leakfix.

554 -

555 - Will merge to 'master'.

556 - source: <pull.1189.git.git.1643335098710.gitgitgadget@gmail.com>

557 -

558 -

442 * js/diff-filter-negation-fix (2022-01-28) 3 commits

443 (merged to 'next' on 2022-02-08 at fe004a4c2c)

444 + diff-filter: be more careful when looking for negative bits

@@ -591,16 +474,6 @@ Release tarballs are available at:

474 source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>

475

476

594 -* rc/negotiate-only-typofix (2022-01-28) 1 commit

595 - (merged to 'next' on 2022-02-04 at 62b947ddbf)

596 - + fetch: fix negotiate-only error message

597 -

598 - Typofix.

599 -

600 - Will merge to 'master'.

601 - source: <20220128143602.31842-1-robert@coup.net.nz>

602 -

603 -

477 * rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit

478 - receive-pack: check if client is alive before completing the push

479

@@ -628,18 +501,6 @@ Release tarballs are available at:

501 source: <20220202042015.10115-1-jerry@skydio.com>

502

503

631 -* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit

632 - (merged to 'next' on 2022-02-04 at 8af6ab286d)

633 - + fetch --prune: exit with error if pruning fails

634 -

635 - When "git fetch --prune" failed to prune the refs it wanted to

636 - prune, the command issued error messages but exited with exit

637 - status 0, which has been corrected.

638 -

639 - Will merge to 'master'.

640 - source: <20220131133047.1885074-1-t.gummerer@gmail.com>

641 -

642 -

504 * ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit

505 (merged to 'next' on 2022-02-08 at 1a8001f83e)

506 + perl Git.pm: don't ignore signalled failure in _cmd_close()

@@ -668,7 +529,8 @@ Release tarballs are available at:

529

530

531 * cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit

671 - - receive-pack: purge temporary data if no command is ready to run

532 + (merged to 'next' on 2022-02-10 at 213f44aec8)

533 + + receive-pack: purge temporary data if no command is ready to run

534

535 Check if "receive-pack" will do any ref updates (various conditions

536 could reject a push) before received objects are taken out of the

@@ -676,7 +538,7 @@ Release tarballs are available at:

538 that is known-to-fail will not leave crufts that a future "gc"

539 needs to clean up.

540

679 - Will merge to 'next'.

541 + Will merge to 'master'.

542 source: <20220129063538.24038-1-bojun.cbj@gmail.com>

543

544

@@ -775,16 +637,6 @@ Release tarballs are available at:

637 source: <20220203101643.1987-1-philipoakley@iee.email>

638

639

778 -* sy/diff-usage-typofix (2022-02-02) 1 commit

779 - (merged to 'next' on 2022-02-04 at 28a4186a44)

780 - + builtin/diff.c: fix "git-diff" usage string typo

781 -

782 - Typofix.

783 -

784 - Will merge to 'master'.

785 - source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>

786 -

787 -

640 * sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits

641 (merged to 'next' on 2022-02-09 at 8b7ecb4e99)

642 + t/lib-read-tree-m-3way: indent with tabs

@@ -818,45 +670,32 @@ Release tarballs are available at:

670 source: <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@google.com>

671

672

821 -* rs/parse-options-lithelp-help (2022-01-20) 1 commit

822 - (merged to 'next' on 2022-02-04 at 74bc57e8fa)

823 - + parse-options: document bracketing of argh

824 -

825 - Comment update.

826 -

827 - Will merge to 'master'.

828 - source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>

829 -

830 -

831 -* jh/p4-various-fixups (2022-01-16) 23 commits

832 - . git-p4: seperate multiple statements onto seperate lines

833 - . git-p4: move inline comments to line above

834 - . git-p4: only seperate code blocks by a single empty line

835 - . git-p4: compare to singletons with "is" and "is not"

836 - . git-p4: normalize indentation of lines in conditionals

837 - . git-p4: ensure there is a single space around all operators

838 - . git-p4: ensure every comment has a single #

839 - . git-p4: remove spaces between dictionary keys and colons

840 - . git-p4: remove redundant backslash-continuations inside brackets

841 - . git-p4: remove extraneous spaces before function arguments

842 - . git-p4: place a single space after every comma

843 - . git-p4: removed brackets when assigning multiple return values

844 - . git-p4: remove spaces around default arguments

845 - . git-p4: remove padding from lists, tuples and function arguments

846 - . git-p4: sort and de-duplcate pylint disable list

847 - . git-p4: remove commented code

848 - . git-p4: convert descriptive class and function comments into docstrings

849 - . git-p4: improve consistency of docstring formatting

850 - . git-p4: indent with 4-spaces

851 - . git-p4: remove unneeded semicolons from statements

852 - . git-p4: add blank lines between functions and class definitions

853 - . Merge branch 'jh/p4-spawning-external-commands-cleanup' into jh/p4-various-fixups

854 - . Merge branch 'jh/p4-fix-use-of-process-error-exception' into jh/p4-various-fixups

673 +* jh/p4-various-fixups (2022-02-10) 22 commits

674 + - git-p4: sort imports

675 + - git-p4: seperate multiple statements onto seperate lines

676 + - git-p4: move inline comments to line above

677 + - git-p4: only seperate code blocks by a single empty line

678 + - git-p4: compare to singletons with "is" and "is not"

679 + - git-p4: normalize indentation of lines in conditionals

680 + - git-p4: ensure there is a single space around all operators

681 + - git-p4: ensure every comment has a single #

682 + - git-p4: remove spaces between dictionary keys and colons

683 + - git-p4: remove redundant backslash-continuations inside brackets

684 + - git-p4: remove extraneous spaces before function arguments

685 + - git-p4: place a single space after every comma

686 + - git-p4: removed brackets when assigning multiple return values

687 + - git-p4: remove spaces around default arguments

688 + - git-p4: remove padding from lists, tuples and function arguments

689 + - git-p4: sort and de-duplcate pylint disable list

690 + - git-p4: remove commented code

691 + - git-p4: convert descriptive class and function comments into docstrings

692 + - git-p4: improve consistency of docstring formatting

693 + - git-p4: indent with 4-spaces

694 + - git-p4: remove unneeded semicolons from statements

695 + - git-p4: add blank lines between functions and class definitions

696

697 Various cleanups to "git p4".

857 -

858 - Breaks its own test suite.

859 - source: <20220116160550.514637-1-jholdsworth@nvidia.com>

698 + source: <20220210164627.279520-1-jholdsworth@nvidia.com>

699

700

701 * rs/bisect-executable-not-found (2022-01-19) 4 commits

@@ -892,19 +731,20 @@ Release tarballs are available at:

731

732

733 * ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits

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

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

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

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

899 - - refs: allow passing flags when beginning transactions

900 - - refs: extract packed_refs_delete_refs() to allow control of transaction

734 + (merged to 'next' on 2022-02-10 at 4866a64508)

735 + + refs: skip hooks when deleting uncovered packed refs

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

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

738 + + refs: allow skipping the reference-transaction hook

739 + + refs: allow passing flags when beginning transactions

740 + + refs: extract packed_refs_delete_refs() to allow control of transaction

741

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

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

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

745 hook twice, which has been corrected.

746

907 - Will merge to 'next'.

747 + Will merge to 'master'.

748 source: <cover.1642406989.git.ps@pks.im>

749

750

@@ -921,17 +761,6 @@ Release tarballs are available at:

761 source: <pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>

762

763

924 -* bc/clarify-eol-attr (2022-01-12) 2 commits

925 - (merged to 'next' on 2022-02-04 at dc1db4bd21)

926 - + docs: correct documentation about eol attribute

927 - + t0027: add tests for eol without text in .gitattributes

928 -

929 - Doc and test update around the eol attribute.

930 -

931 - Will merge to 'master'.

932 - source: <20220111021507.531736-1-sandals@crustytoothpaste.net>

933 -

934 -

764 * jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit

765 (merged to 'next' on 2022-02-09 at f26a82c66a)

766 + git-rev-list: add --exclude-first-parent-only flag

@@ -964,18 +793,6 @@ Release tarballs are available at:

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

794

795

967 -* bc/csprng-mktemps (2022-01-17) 2 commits

968 - (merged to 'next' on 2022-02-04 at 2e32375c73)

969 - + wrapper: use a CSPRNG to generate random file names

970 - + wrapper: add a helper to generate numbers from a CSPRNG

971 -

972 - Pick a better random number generator and use it when we prepare

973 - temporary filenames.

974 -

975 - Will merge to 'master'.

976 - source: <20220117215617.843190-1-sandals@crustytoothpaste.net>

977 -

978 -

796 * vd/sparse-clean-etc (2022-01-13) 9 commits

797 (merged to 'next' on 2022-02-09 at 5928dbd25e)

798 + update-index: reduce scope of index expansion in do_reupdate

@@ -1018,28 +835,28 @@ Release tarballs are available at:

835 source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>

836

837

1021 -* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2021-12-22) 2 commits

1022 - - fixup! fetch-pack: parameterize message containing 'ready' keyword

838 +* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2022-02-11) 1 commit

839 - fetch-pack: parameterize message containing 'ready' keyword

840

841 L10n support for a few error messages.

842

1027 - Expecting an ack for fixup.

843 + Will merge to 'next'.

844 source: <20211222075805.19027-1-bagasdotme@gmail.com>

845

846

847 * gc/branch-recurse-submodules (2022-02-04) 7 commits

1032 - - branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks

1033 - - branch: add --recurse-submodules option for branch creation

1034 - - builtin/branch: consolidate action-picking logic in cmd_branch()

1035 - - branch: add a dry_run parameter to create_branch()

1036 - - branch: make create_branch() always create a branch

1037 - - branch: move --set-upstream-to behavior to dwim_and_setup_tracking()

1038 - - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules

848 + (merged to 'next' on 2022-02-10 at b54367ff92)

849 + + branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks

850 + + branch: add --recurse-submodules option for branch creation

851 + + builtin/branch: consolidate action-picking logic in cmd_branch()

852 + + branch: add a dry_run parameter to create_branch()

853 + + branch: make create_branch() always create a branch

854 + + branch: move --set-upstream-to behavior to dwim_and_setup_tracking()

855 + + Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules

856

857 "git branch" learned the "--recurse-submodules" option.

858

1042 - Will merge to 'next'.

859 + Will merge to 'master'.

860 source: <20220129000446.99261-1-chooglen@google.com>

861

862

@@ -1165,9 +982,8 @@ Release tarballs are available at:

982 source: <cover.1644319434.git.dyroneteng@gmail.com>

983

984

1168 -* jh/builtin-fsmonitor-part2 (2021-12-25) 31 commits

1169 - - fixup! t7527: create test for fsmonitor--daemon

1170 - - fixup! t/perf/p7519: speed up test on Windows

985 +* jh/builtin-fsmonitor-part2 (2022-02-11) 30 commits

986 + - update-index: convert fsmonitor warnings to advise

987 - t7527: test status with untracked-cache and fsmonitor--daemon

988 - fsmonitor: force update index after large responses

989 - fsmonitor--daemon: use a cookie file to sync with file system

@@ -1196,14 +1012,10 @@ Release tarballs are available at:

1012 - fsmonitor: use IPC to query the builtin FSMonitor daemon

1013 - fsmonitor: config settings are repository-specific

1014 - fsmonitor-ipc: create client routines for git-fsmonitor--daemon

1199 - - fsmonitor: enhance existing comments

1015 + - fsmonitor: enhance existing comments, clarify trivial response handling

1016

1017 Built-in fsmonitor (part 2).

1202 -

1203 - Expecting a reroll.

1204 - Seems that the discussion stalled.

1205 - cf. <d9c3ef61-768c-3560-2858-3438c355a742@jeffhostetler.com>

1206 - source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>

1018 + source: <pull.1041.v5.git.1644612979.gitgitgadget@gmail.com>

1019

1020

1021 * es/superproject-aware-submodules (2022-02-03) 4 commits

What's cooking (2022/02 #03)