33535f5253 · 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 (May 2020, #02; Tue, 5)

4 -X-master-at: 07d8ea56f2ecb64b75b92264770c0a664231ce17

5 -X-next-at: 55c56c9c57da646085d27e61a3420043978ab4a1

3 +Subject: What's cooking in git.git (May 2020, #03; Fri, 8)

4 +X-master-at: b994622632154fc3b17fb40a38819ad954a5fb88

5 +X-next-at: 0e0b3e54bef85529846ce55fa34a67746509a2cd

6

7 -What's cooking in git.git (May 2020, #02; Tue, 5)

7 +What's cooking in git.git (May 2020, #03; Fri, 8)

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

9

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

@@ -12,6 +12,11 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 +I have been a bit more aggressive than usual in merging topics down

16 +to 'next' and 'master' this week, in preparation for -rc0, scheduled

17 +on the 14th. We may need to apply last-minute fixes to some of

18 +these topics but let's hope that we can keep them to the minimum.

19 +

20 You can find the changes described here in the integration branches

21 of the repositories listed at

22

@@ -20,276 +25,264 @@ of the repositories listed at

25 --------------------------------------------------

26 [Graduated to "master"]

27

23 -* bc/wildcard-credential (2020-04-27) 1 commit

24 - (merged to 'next' on 2020-04-28 at 1a0d6b91dc)

25 - + credential: fix matching URLs with multiple levels in path

28 +* ah/userdiff-markdown (2020-05-02) 1 commit

29 + (merged to 'next' on 2020-05-05 at b8e64b75d0)

30 + + userdiff: support Markdown

31 +

32 + The userdiff patterns for Markdown documents have been added.

33 +

34

27 - Update the parser used for credential.<URL>.<variable>

28 - configuration, to handle <URL>s with '/' in them correctly.

35 +* bc/doc-credential-helper-value (2020-05-06) 1 commit

36 + (merged to 'next' on 2020-05-07 at de685cea7b)

37 + + docs: document credential.helper allowed values

38

39 + Doc update.

40 +

41 +

42 +* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit

43 + (merged to 'next' on 2020-05-06 at 5cccb0e1a8)

44 + + builtin/receive-pack: avoid generic function name hmac()

45 +

46 + The <stdlib.h> header on NetBSD brings in its own definition of

47 + hmac() function (eek), which conflicts with our own and unrelated

48 + function with the same name. Our function has been renamed to work

49 + around the issue.

50

31 -* dd/iso-8601-updates (2020-04-24) 4 commits

32 - (merged to 'next' on 2020-04-28 at 18fba39171)

33 - + date.c: allow compact version of ISO-8601 datetime

34 - + date.c: skip fractional second part of ISO-8601

35 - + date.c: validate and set time in a helper function

36 - + date.c: s/is_date/set_date/

51

38 - The approxidate parser learns to parse seconds with fraction.

52 +* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits

53 + (merged to 'next' on 2020-05-05 at 5b919ec5d6)

54 + + credential-store: ignore bogus lines from store file

55 + + credential-store: document the file format a bit more

56

57 + With the recent tightening of the code that is used to parse

58 + various parts of a URL for use in the credential subsystem, a

59 + hand-edited credential-store file causes the credential helper to

60 + die, which is a bit too harsh to the users. Demote the error

61 + behaviour to just ignore and keep using well-formed lines instead.

62

41 -* dd/mailinfo-with-nul (2020-04-22) 3 commits

42 - (merged to 'next' on 2020-04-28 at b1d3e40d49)

43 - + mailinfo: disallow NUL character in mail's header

44 - + mailinfo.c: avoid strlen on strings that can contains NUL

45 - + t4254: merge 2 steps of a single test

63

47 - Tighten "git mailinfo" to notice and error out when decoded result

48 - contains NUL in it.

64 +* cb/t0000-use-the-configured-shell (2020-05-07) 1 commit

65 + (merged to 'next' on 2020-05-07 at c5db4882c4)

66 + + t/t0000-basic: make sure subtests also use TEST_SHELL_PATH

67

68 + The basic test did not honor $TEST_SHELL_PATH setting, which has

69 + been corrected.

70

51 -* dd/sparse-fixes (2020-04-27) 4 commits

52 - (merged to 'next' on 2020-04-28 at d809f916ee)

53 - + progress.c: silence cgcc suggestion about internal linkage

54 - + graph.c: limit linkage of internal variable

55 - + compat/regex: move stdlib.h up in inclusion chain

56 - + test-parse-pathspec-file.c: s/0/NULL/ for pointer type

71

58 - Compilation fix.

72 +* cb/test-bash-lineno-fix (2020-05-07) 1 commit

73 + (merged to 'next' on 2020-05-07 at 8c07e52d2f)

74 + + t/test_lib: avoid naked bash arrays in file_lineno

75

76 + Recent change to show files and line numbers of a breakage during

77 + test (only available when running the tests with bash) were hurting

78 + other shells with syntax errors, which has been corrected.

79

61 -* dl/opt-callback-cleanup (2020-04-28) 1 commit

62 - (merged to 'next' on 2020-04-28 at aa773e183a)

63 - + Use OPT_CALLBACK and OPT_CALLBACK_F

80

65 - Code cleanup.

81 +* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit

82 + (merged to 'next' on 2020-05-06 at 8b570b7722)

83 + + Doc: reference the "stash list" in autostash docs

84

85 + Doc update.

86

68 -* dl/push-recurse-submodules-fix (2020-04-28) 1 commit

69 - (merged to 'next' on 2020-04-28 at c2cd20ef9e)

70 - + push: unset PARSE_OPT_OPTARG for --recurse-submodules

87

72 - Code cleanup.

88 +* dl/switch-c-option-in-error-message (2020-04-30) 1 commit

89 + (merged to 'next' on 2020-05-05 at 472db48735)

90 + + switch: fix errors and comments related to -c and -C

91 +

92 + In error messages that "git switch" mentions its option to create a

93 + new branch, "-b/-B" options were shown, where "-c/-C" options

94 + should be, which has been corrected.

95 +

96 +

97 +* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit

98 + (merged to 'next' on 2020-05-06 at de7b38aee5)

99 + + sparse-checkout: stop blocking empty workdirs

100 +

101 + The sparse-checkout patterns have been forbidden from excluding all

102 + paths, leaving an empty working tree, for a long time. This

103 + limitation has been lifted.

104 +

105 +

106 +* es/restore-staged-from-head-by-default (2020-05-05) 1 commit

107 + (merged to 'next' on 2020-05-06 at c4abf9b5df)

108 + + restore: default to HEAD when combining --staged and --worktree

109 +

110 + "git restore --staged --worktree" now defaults to take the contents

111 + out of "HEAD", instead of erring out.

112 +

113 +

114 +* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit

115 + (merged to 'next' on 2020-05-06 at 2325148249)

116 + + CodingGuidelines: drop arithmetic expansion advice to use "$x"

117 +

118 + The coding guideline for shell scripts instructed to refer to a

119 + variable with dollar-sign inside arithmetic expansion to work

120 + around a bug in old versions of dash, which is a thing of the past.

121 + Now we are not forbidden from writing $((var+1)).

122 +

123 +

124 +* jk/credential-sample-update (2020-05-01) 2 commits

125 + (merged to 'next' on 2020-05-06 at c72ed30ee5)

126 + + gitcredentials(7): make shell-snippet example more realistic

127 + + gitcredentials(7): clarify quoting of helper examples

128 +

129 + The samples in the credential documentation has been updated to

130 + make it clear that we depict what would appear in the .git/config

131 + file, by adding appropriate quotes as needed..

132

133

75 -* dl/test-must-fail-fixes-4 (2020-04-20) 7 commits

76 - (merged to 'next' on 2020-04-28 at 6f4804aa09)

77 - + t9819: don't use test_must_fail with p4

78 - + t9164: use test_must_fail only on git commands

79 - + t9160: use test_path_is_missing()

80 - + t9141: use test_path_is_missing()

81 - + t7508: don't use `test_must_fail test_cmp`

82 - + t7408: replace incorrect uses of test_must_fail

83 - + t6030: use test_path_is_missing()

134 +* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits

135 + (merged to 'next' on 2020-05-06 at f4e4ca3cb4)

136 + + ref-filter: apply fallback refname sort only after all user sorts

137 + + ref-filter: apply --ignore-case to all sorting keys

138

85 - Test clean-up.

139 + "git branch" and other "for-each-ref" variants accepted multiple

140 + --sort=<key> options in the increasing order of precedence, but it

141 + had a few breakages around "--ignore-case" handling, and tie-breaking

142 + with the refname, which have been fixed.

143

144

88 -* ds/blame-on-bloom (2020-04-23) 6 commits

89 - (merged to 'next' on 2020-04-28 at 6152eb2eb3)

90 - + test-bloom: check that we have expected arguments

91 - + test-bloom: fix some whitespace issues

92 - + blame: drop unused parameter from maybe_changed_path

93 - (merged to 'next' on 2020-04-22 at dc4f24e54b)

94 - + blame: use changed-path Bloom filters

95 - + tests: write commit-graph with Bloom filters

96 - + revision: complicated pathspecs disable filters

97 - (this branch is used by ds/line-log-on-bloom; uses gs/commit-graph-path-filter.)

145 +* jt/commit-graph-plug-memleak (2020-05-04) 1 commit

146 + (merged to 'next' on 2020-05-06 at 0f80a2b561)

147 + + commit-graph: avoid memory leaks

148

99 - "git blame" learns to take advantage of the "changed-paths" Bloom

100 - filter stored in the commit-graph file.

149 + Fix a leak noticed by fuzzer.

150

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

152 +[New Topics]

153

103 -* ds/build-homebrew-gettext-fix (2020-04-27) 1 commit

104 - (merged to 'next' on 2020-04-28 at 70c6eca470)

105 - + macOS/brew: let the build find gettext headers/libraries/msgfmt

154 +* ss/faq-ignore (2020-05-06) 1 commit

155 + (merged to 'next' on 2020-05-07 at 6273caaf77)

156 + + gitfaq: files in .gitignore are tracked

157

107 - Recent update to Homebrew used by macOS folks breaks build by

108 - moving gettext library and necessary headers.

158 + Random bits of FAQ.

159

160 + Will merge to 'master'.

161

111 -* ds/multi-pack-index (2020-04-24) 1 commit

112 - (merged to 'next' on 2020-04-28 at b8f9691cbc)

113 - + multi-pack-index: close file descriptor after mmap

162

115 - The multi-pack-index left mmapped file descriptors open when it

116 - does not have to.

163 +* ss/faq-fetch-pull (2020-05-06) 1 commit

164 + (merged to 'next' on 2020-05-07 at d57224374e)

165 + + gitfaq: fetching and pulling a repository

166

167 + Random bits of FAQ.

168

119 -* eb/gitweb-more-trailers (2020-04-24) 1 commit

120 - (merged to 'next' on 2020-04-28 at 7b16ac0810)

121 - + gitweb: Recognize *-to and Closes/Fixes trailers

169 + Will merge to 'master'.

170

123 - Gitweb updates.

171

172 +* jc/auto-gc-quiet (2020-05-07) 2 commits

173 + (merged to 'next' on 2020-05-07 at 6cc69513c3)

174 + + auto-gc: pass --quiet down from am, commit, merge and rebase

175 + + auto-gc: extract a reusable helper from "git fetch"

176

126 -* en/rebase-root-and-fork-point-are-incompatible (2020-04-27) 1 commit

127 - (merged to 'next' on 2020-04-28 at 8ea4882905)

128 - + rebase: display an error if --root and --fork-point are both provided

177 + Teach "am", "commit", "merge" and "rebase", when they are run with

178 + the "--quiet" option, to pass "--quiet" down to "gc --auto".

179

130 - Incompatible options "--root" and "--fork-point" of "git rebase"

131 - have been marked and documented as being incompatible.

180 + Will merge to 'master'.

181

182

134 -* es/bugreport (2020-04-27) 6 commits

135 - (merged to 'next' on 2020-04-28 at fdfd36a5d7)

136 - + bugreport: drop extraneous includes

137 - (merged to 'next' on 2020-04-22 at f5a2ab988e)

138 - + bugreport: add compiler info

139 - + bugreport: add uname info

140 - + bugreport: gather git version and build info

141 - + bugreport: add tool to generate debugging info

142 - + help: move list_config_help to builtin/help

143 - (this branch is used by es/bugreport-with-hooks.)

183 +* jt/t5500-unflake (2020-05-06) 1 commit

184 + - t5500: count objects through stderr, not trace

185

145 - The "bugreport" tool.

186 + Test fix for a topic already in 'master' and meant for 'maint'.

187

188 + Expecting an update to clarify the log message.

189 + Otherwise the change itself looked good.

190

148 -* gs/commit-graph-path-filter (2020-04-09) 16 commits

149 - (merged to 'next' on 2020-04-22 at 34b35f43bd)

150 - + bloom: ignore renames when computing changed paths

151 - + commit-graph: add GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS test flag

152 - + t4216: add end to end tests for git log with Bloom filters

153 - + revision.c: add trace2 stats around Bloom filter usage

154 - + revision.c: use Bloom filters to speed up path based revision walks

155 - + commit-graph: add --changed-paths option to write subcommand

156 - + commit-graph: reuse existing Bloom filters during write

157 - + commit-graph: write Bloom filters to commit graph file

158 - + commit-graph: examine commits by generation number

159 - + commit-graph: examine changed-path objects in pack order

160 - + commit-graph: compute Bloom filters for changed paths

161 - + diff: halt tree-diff early after max_changes

162 - + bloom.c: core Bloom filter implementation for changed paths.

163 - + bloom.c: introduce core Bloom filter constructs

164 - + bloom.c: add the murmur3 hash implementation

165 - + commit-graph: define and use MAX_NUM_CHUNKS

166 - (this branch is used by ds/blame-on-bloom and ds/line-log-on-bloom.)

191

168 - Introduce an extension to the commit-graph to make it efficient to

169 - check for the paths that were modified at each commit using Bloom

170 - filters.

192 +* jk/ci-only-on-selected-branches (2020-05-07) 1 commit

193 + (merged to 'next' on 2020-05-07 at f3227dd3d3)

194 + + ci: allow per-branch config for GitHub Actions

195

196 + Instead of always building all branches at GitHub via Actions,

197 + users can specify which branches to build.

198

173 -* jk/build-with-right-curl (2020-04-05) 3 commits

174 - (merged to 'next' on 2020-04-28 at 1718c25b44)

175 - + Makefile: avoid running curl-config unnecessarily

176 - + Makefile: use curl-config --cflags

177 - + Makefile: avoid running curl-config multiple times

199 + Will merge to 'master'.

200

179 - The build procedure did not use the libcurl library and its include

180 - files correctly for a custom-built installation.

181 - cf. <20200428033611.GB2369457@coredump.intra.peff.net>

201

202 +* cc/upload-pack-v2-fetch-fix (2020-05-08) 1 commit

203 + (merged to 'next' on 2020-05-08 at d26b87d06d)

204 + + upload-pack: clear filter_options for each v2 fetch command

205

184 -* jk/test-fail-prereqs-fix (2020-04-28) 1 commit

185 - (merged to 'next' on 2020-04-28 at 75787711c0)

186 - + t0000: disable GIT_TEST_FAIL_PREREQS in sub-tests

206 + Serving a "git fetch" client over "git://" and "ssh://" protocols

207 + using the on-wire protocol version 2 was buggy on the server end

208 + when the client needs to make a follow-up request to

209 + e.g. auto-follow tags.

210

188 - Test update.

211 + Will merge to 'master'.

212

213

191 -* js/anonymise-push-url-in-errors (2020-04-28) 1 commit

192 - (merged to 'next' on 2020-04-28 at 49539cf116)

193 - + push: anonymize URLs in error messages and warnings

214 +* cw/bisect-replay-with-dos (2020-05-08) 1 commit

215 + - bisect: allow CRLF line endings in "git bisect replay" input

216

195 - Error and verbose trace messages from "git push" did not redact

196 - credential material embedded in URLs.

217 + "git bisect replay" had trouble with input files when they used

218 + CRLF line ending, which has been corrected.

219

220 + Will merge to 'next'.

221

199 -* js/partial-urlmatch (2020-04-29) 3 commits

200 - (merged to 'next' on 2020-05-01 at e7017fcfd1)

201 - + Sync with js/partial-urlmatch-2.17

202 - + credential: handle `credential.<partial-URL>.<key>` again

203 - + credential: optionally allow partial URLs in credential_from_url_gently()

204 - (this branch uses js/partial-urlmatch-2.17.)

222

206 - The same as js/partial-urlmatch-2.17, built on more recent codebase

207 - to avoid unnecessary merge conflicts.

223 +* dd/bloom-sparse-fix (2020-05-07) 1 commit

224 + (merged to 'next' on 2020-05-08 at 1067403c01)

225 + + bloom: fix `make sparse` warning

226

227 + Code clean-up.

228

210 -* js/partial-urlmatch-2.17 (2020-04-29) 3 commits

211 - (merged to 'next' on 2020-05-01 at 7c69571f89)

212 - + credential: handle `credential.<partial-URL>.<key>` again

213 - + credential: optionally allow partial URLs in credential_from_url_gently()

214 - + credential: fix grammar

215 - (this branch is used by js/partial-urlmatch.)

229 + Will merge to 'master'.

230

217 - Recent updates broke parsing of "credential.<url>.<key>" where

218 - <url> is not a full URL (e.g. [credential "https://"] helper = ...)

219 - stopped working, which has been corrected.

231

232 +* ds/sparse-updates-oob-access-fix (2020-05-08) 1 commit

233 + (merged to 'next' on 2020-05-08 at fd007758ea)

234 + + unpack-trees: avoid array out-of-bounds error

235

222 -* jt/v2-fetch-nego-fix (2020-04-28) 3 commits

223 - (merged to 'next' on 2020-04-28 at c6f9ebf2f7)

224 - + fetch-pack: in protocol v2, reset in_vain upon ACK

225 - + fetch-pack: in protocol v2, in_vain only after ACK

226 - + fetch-pack: return enum from process_acks()

236 + The code to skip unmerged paths in the index when sparse checkout

237 + is in use would have made out-of-bound access of the in-core index

238 + when the last path was unmerged, which has been corrected.

239

228 - The upload-pack protocol v2 gave up too early before finding a

229 - common ancestor, resulting in a wasteful fetch from a fork of a

230 - project. This has been corrected to match the behaviour of v0

231 - protocol.

240 + Will merge to 'master'.

241

242

234 -* mt/doc-worktree-ref (2020-04-24) 1 commit

235 - (merged to 'next' on 2020-04-28 at d96c05cb0a)

236 - + config doc: fix reference to config.worktree info

243 +* hn/refs-cleanup (2020-05-08) 4 commits

244 + - t: use update-ref and show-ref to reading/writing refs

245 + - refs: document how ref_iterator_advance_fn should handle symrefs

246 + - Iterate over the "refs/" namespace in for_each_[raw]ref

247 + - refs.h: clarify reflog iteration order

248 + (this branch is used by hn/reftable.)

249

238 - Docfix.

250 + Preliminary clean-ups around refs API.

251

252 + Needs minor rework but otherwise looks ready.

253 + I splitted these out of the hn/reftable topic, hoping that these

254 + should be easier to polish and merge quickly than the rest of the

255 + series.

256

241 -* tb/commit-graph-fd-exhaustion-fix (2020-04-24) 4 commits

242 - (merged to 'next' on 2020-04-28 at 6d5fd6bc49)

243 - + commit-graph: close descriptors after mmap

244 - + commit-graph.c: gracefully handle file descriptor exhaustion

245 - + t/test-lib.sh: make ULIMIT_FILE_DESCRIPTORS available to tests

246 - + commit-graph.c: don't use discarded graph_name in error

247 - (this branch is tangled with tb/commit-graph-split-strategy.)

257

249 - The commit-graph code exhausted file descriptors easily when it

250 - does not have to.

258 +* jc/codingstyle-compare-with-null (2020-05-08) 1 commit

259 + - CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL

260

261 + Doc update.

262

253 -* tb/commit-graph-perm-bits (2020-04-29) 5 commits

254 - (merged to 'next' on 2020-04-29 at 66a87c1fbc)

255 - + commit-graph.c: make 'commit-graph-chain's read-only

256 - + commit-graph.c: ensure graph layers respect core.sharedRepository

257 - + commit-graph.c: write non-split graphs as read-only

258 - + lockfile.c: introduce 'hold_lock_file_for_update_mode'

259 - + tempfile.c: introduce 'create_tempfile_mode'

263 + Will merge to 'next'.

264

261 - Some of the files commit-graph subsystem keeps on disk did not

262 - correctly honor the core.sharedRepository settings and some were

263 - left read-write.

265

266 +* ss/submodule-set-url-in-c (2020-05-08) 1 commit

267 + (merged to 'next' on 2020-05-08 at 93e390eb33)

268 + + submodule: port subcommand 'set-url' from shell to C

269

266 -* tb/commit-graph-split-strategy (2020-04-29) 8 commits

267 - (merged to 'next' on 2020-04-29 at 99fa922569)

268 - + Revert "commit-graph.c: introduce '--[no-]check-oids'"

269 - + commit-graph.c: introduce '--[no-]check-oids'

270 - + commit-graph.h: replace 'commit_hex' with 'commits'

271 - + oidset: introduce 'oidset_size'

272 - + builtin/commit-graph.c: introduce split strategy 'replace'

273 - + builtin/commit-graph.c: introduce split strategy 'no-merge'

274 - + builtin/commit-graph.c: support for '--split[=<strategy>]'

275 - + t/helper/test-read-graph.c: support commit-graph chains

276 - (this branch is tangled with tb/commit-graph-fd-exhaustion-fix.)

270 + Rewriting various parts of "git submodule" in C continues.

271

278 - "git commit-graph write" learned different ways to write out split

279 - files.

272 + Will merge to 'master'.

273

274 +--------------------------------------------------

275 +[Stalled]

276

282 -* tb/reset-shallow (2020-04-24) 2 commits

283 - (merged to 'next' on 2020-04-28 at 9510639ae8)

284 - + shallow.c: use '{commit,rollback}_shallow_file'

285 - + t5537: use test_write_lines and indented heredocs for readability

286 - (this branch is used by tb/shallow-cleanup.)

277 +* mk/use-size-t-in-zlib (2018-10-15) 1 commit

278 + - zlib.c: use size_t for size

279

288 - Fix in-core inconsistency after fetching into a shallow repository

289 - that broke the code to write out commit-graph.

280 + The wrapper to call into zlib followed our long tradition to use

281 + "unsigned long" for sizes of regions in memory, which have been

282 + updated to use "size_t".

283

284 --------------------------------------------------

292 -[New Topics]

285 +[Cooking]

286

287 * ds/line-log-on-bloom (2020-05-01) 12 commits

288 - line-log: integrate with changed-path Bloom filters

@@ -312,104 +305,43 @@ of the repositories listed at

305 cf. <4b7e5f51-9fdb-45ac-123e-2589087afa48@gmail.com>

306

307

315 -* es/restore-staged-from-head-by-default (2020-05-05) 1 commit

316 - - restore: default to HEAD when combining --staged and --worktree

317 -

318 - "git restore --staged --worktree" now defaults to take the contents

319 - out of "HEAD", instead of erroring out.

320 -

321 - Will merge to 'next'.

322 -

323 -

324 -* jk/credential-sample-update (2020-05-01) 2 commits

325 - - gitcredentials(7): make shell-snippet example more realistic

326 - - gitcredentials(7): clarify quoting of helper examples

327 -

328 - The samples in the credential documentation has been updated to

329 - make it clear that we depict what would appear in the .git/config

330 - file, by adding appropriate quotes as needed..

331 -

332 - Will merge to 'next'.

333 -

334 -

335 -* jk/for-each-ref-multi-key-sort-fix (2020-05-04) 2 commits

336 - - ref-filter: apply fallback refname sort only after all user sorts

337 - - ref-filter: apply --ignore-case to all sorting keys

338 -

339 - "git branch" and other "for-each-ref" variants accepted multiple

340 - --sort=<key> options in the increasing order of precedence, but it

341 - had a few breakages around "--ignore-case" handling, and tiebreaking

342 - with the refname, which have been fixed.

343 -

344 - Will merge to 'next'.

345 -

346 -

347 -* js/rebase-autosquash-double-fixup-fix (2020-05-04) 1 commit

308 +* js/rebase-autosquash-double-fixup-fix (2020-05-05) 1 commit

309 - rebase --autosquash: fix a potential segfault

310

311 "rebase -i" segfaulted when rearranging a sequence that has a

312 fix-up that applies another fix-up (which may or may not be a

313 fix-up of yet another step).

314

354 - Under review.

355 - cf. <pull.625.git.1588624804554.gitgitgadget@gmail.com>

315 + Expecting a bit more explanation in the log message.

316

317

358 -* jt/commit-graph-plug-memleak (2020-05-04) 1 commit

359 - - commit-graph: avoid memory leaks

360 -

361 - Fix a leak noticed by fuzzer.

362 -

363 - Will merge to 'next'.

364 -

365 -

366 -* cb/credential-doc-fixes (2020-05-04) 4 commits

367 - - credential: document protocol updates

368 - - credential: update gitcredentials documentation

369 - - credential: correct order of parameters for credential_match

370 - - credential: update description for credential_from_url_gently

318 +* cb/credential-doc-fixes (2020-05-07) 4 commits

319 + (merged to 'next' on 2020-05-07 at 993b36071e)

320 + + credential: document protocol updates

321 + + credential: update gitcredentials documentation

322 + + credential: correct order of parameters for credential_match

323 + + credential: update description for credential_from_url_gently

324

325 Minor in-code comments and documentation updates around credential

326 API.

327

375 - Needs review.

376 - cf. <20200505013908.4596-1-carenas@gmail.com>

377 -

378 -

379 -* ds/sparse-allow-empty-working-tree (2020-05-04) 1 commit

380 - - sparse-checkout: stop blocking empty workdirs

381 -

382 - The sparse-checkout patterns have been forbidden from excluding all

383 - paths, leaving an empty working tree, for a long time. This

384 - limitation has been lifted.

385 -

386 - Will merge to 'next'.

387 -

388 -

389 -* jk/arith-expansion-coding-guidelines (2020-05-04) 1 commit

390 - - CodingGuidelines: drop arithmetic expansion advice to use "$x"

391 -

392 - The coding guideline for shell scripts instructed to refer to a

393 - variable with dollar-sign inside airthmetic expansion to work

394 - around a bug in old versions of dash, which is a thing of the past.

395 - Now we are not forbidden from writing $((var+1)).

396 -

397 - Will merge to 'next'.

328 + Will merge to 'master'.

329

330

331 * tb/bitmap-walk-with-tree-zero-filter (2020-05-04) 4 commits

401 - - pack-bitmap: pass object filter to fill-in traversal

402 - - pack-bitmap.c: support 'tree:0' filtering

403 - - pack-bitmap.c: make object filtering functions generic

404 - - list-objects-filter: treat NULL filter_options as "disabled"

332 + (merged to 'next' on 2020-05-06 at fbb3fbbb85)

333 + + pack-bitmap: pass object filter to fill-in traversal

334 + + pack-bitmap.c: support 'tree:0' filtering

335 + + pack-bitmap.c: make object filtering functions generic

336 + + list-objects-filter: treat NULL filter_options as "disabled"

337

338 The object walk with object filter "--filter=tree:0" can now take

339 advantage of the pack bitmap when available.

340

409 - Will merge to 'next'.

341 + Will merge to 'master'.

342

343

412 -* tb/commit-graph-no-check-oids (2020-05-04) 8 commits

344 +* tb/commit-graph-no-check-oids (2020-05-05) 8 commits

345 - commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag

346 - t5318: reorder test below 'graph_read_expect'

347 - commit-graph.c: simplify 'fill_oids_from_commits'

@@ -421,27 +353,9 @@ of the repositories listed at

353

354 Clean-up the commit-graph codepath.

355

424 - Expecting a reroll

425 - cf. <20200505161649.GG69300@syl.local>

426 -

427 -

428 -* cb/avoid-colliding-with-netbsd-hmac (2020-05-05) 1 commit

429 - - builtin/receive-pack: avoid generic function name hmac()

430 -

431 - The <stdlib.h> header on NetBSD brings in its own definition of

432 - hmac() function (eek), which conflicts with our own and unrelated

433 - function with the same name. Our function has been renamed to work

434 - around the issue.

435 -

436 - Will merge to 'next'.

437 -

438 -

439 -* dl/doc-stash-remove-mention-of-reflog (2020-05-05) 1 commit

440 - - Doc: reference the "stash list" in autostash docs

441 -

442 - Doc update.

443 -

444 - Will merge to 'next'.

356 + Expecting a reroll.

357 + cf. <20200507204204.GF29683@coredump.intra.peff.net>

358 + cf. <20200507200305.GB29683@coredump.intra.peff.net>

359

360

361 * dl/test-must-fail-fixes-5 (2020-05-05) 4 commits

@@ -456,60 +370,7 @@ of the repositories listed at

370 cf. <cover.1588162842.git.liu.denton@gmail.com>

371

372

459 -* dd/ci-only-on-selective-branches (2020-05-05) 2 commits

460 - - CI: limit GitHub Actions to designated branches

461 - - SubmittingPatches: advertise GitHub Actions CI

462 -

463 - Instead of always building all branches of all forks of our project

464 - at GitHub via GitHub Actions, only build when branches with known

465 - and specific names are updated, and also a pull request.

466 -

467 - Expecting an update.

468 - cf. <cover.1588695295.git.congdanhqx@gmail.com>

469 - The description talks too much about helping (or not getting in the

470 - way of) the current maintainer, but the focus should instead be

471 - general contributors.

472 -

473 ---------------------------------------------------

474 -[Stalled]

475 -

476 -* mk/use-size-t-in-zlib (2018-10-15) 1 commit

477 - - zlib.c: use size_t for size

478 -

479 - The wrapper to call into zlib followed our long tradition to use

480 - "unsigned long" for sizes of regions in memory, which have been

481 - updated to use "size_t".

482 -

483 ---------------------------------------------------

484 -[Cooking]

485 -

486 -* cb/credential-store-ignore-bogus-lines (2020-05-02) 2 commits

487 - (merged to 'next' on 2020-05-05 at 5b919ec5d6)

488 - + credential-store: ignore bogus lines from store file

489 - + credential-store: document the file format a bit more

490 -

491 - With the recent tightening of the code that is used to parse

492 - various parts of a URL for use in the credential subsystem, a

493 - hand-edited credential-store file causes the credential helper to

494 - die, which is a bit too harsh to the users. Demote the error

495 - behaviour to only warn and keep using well-formed lines instead.

496 -

497 - Will merge to 'master'.

498 -

499 -

500 -* dl/switch-c-option-in-error-message (2020-04-30) 1 commit

501 - (merged to 'next' on 2020-05-05 at 472db48735)

502 - + switch: fix errors and comments related to -c and -C

503 -

504 - In error messages that "git switch" mentions its option to create a

505 - new branch, "-b/-B" options were shown, where "-c/-C" options

506 - should be, which has been corrected.

507 -

508 - Will merge to 'master'.

509 -

510 -

511 -* es/bugreport-with-hooks (2020-04-30) 2 commits

512 - - SQUASH???

373 +* es/bugreport-with-hooks (2020-05-07) 1 commit

374 - bugreport: collect list of populated hooks

375

376 "git bugreport" learned to report enabled hooks in the repository.

@@ -529,15 +390,6 @@ of the repositories listed at

390 Will merge to 'master'.

391

392

532 -* ah/userdiff-markdown (2020-05-02) 1 commit

533 - (merged to 'next' on 2020-05-05 at b8e64b75d0)

534 - + userdiff: support Markdown

535 -

536 - The userdiff patterns for Markdown documents have been added.

537 -

538 - Will merge to 'master'.

539 -

540 -

393 * mr/bisect-in-c-2 (2020-04-23) 12 commits

394 - bisect--helper: retire `--bisect-autostart` subcommand

395 - bisect--helper: retire `--write-terms` subcommand

@@ -601,7 +453,7 @@ of the repositories listed at

453 Needs review.

454

455

604 -* jx/proc-receive-hook (2020-05-05) 7 commits

456 +* jx/proc-receive-hook (2020-05-07) 7 commits

457 - doc: add documentation for the proc-receive hook

458 - receive-pack: new config receive.procReceiveRefs

459 - refs.c: refactor to reuse ref_is_hidden()

@@ -616,8 +468,7 @@ of the repositories listed at

468 Needs review.

469

470

619 -* hn/reftable (2020-05-04) 12 commits

620 - - t: use update-ref and show-ref to reading/writing refs

471 +* hn/reftable (2020-05-08) 8 commits

472 - Add some reftable testing infrastructure

473 - vcxproj: adjust for the reftable changes

474 - Reftable support for git-core

@@ -626,16 +477,14 @@ of the repositories listed at

477 - reftable: define version 2 of the spec to accomodate SHA256

478 - reftable: file format documentation

479 - Add .gitattributes for the reftable/ directory

629 - - refs: document how ref_iterator_advance_fn should handle symrefs

630 - - Iterate over the "refs/" namespace in for_each_[raw]ref

631 - - refs.h: clarify reflog iteration order

480 + (this branch uses hn/refs-cleanup.)

481

482 A new refs backend "reftable" to replace the traditional

483 combination of packed-refs files and one-file-per-ref loose refs

484 has been implemented and integrated for improved performance and

485 atomicity.

486

638 - At v11.

487 + Needs review.

488

489 --------------------------------------------------

490 [Discarded]

@@ -654,3 +503,14 @@ of the repositories listed at

503 them mark the commits with an embedded "[skip ci]" string.

504

505 Superseded by dd/ci-only-on-selective-branches topic.

506 +

507 +

508 +* dd/ci-only-on-selective-branches (2020-05-05) 2 commits

509 + - CI: limit GitHub Actions to designated branches

510 + - SubmittingPatches: advertise GitHub Actions CI

511 +

512 + Instead of always building all branches of all forks of our project

513 + at GitHub via GitHub Actions, only build when branches with known

514 + and specific names are updated, and also a pull request.

515 +

516 + Superseded by jk/ci-only-on-selected-branches

What's cooking (2020/05 #03)