f369f328bb · 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 (Apr 2020, #03; Tue, 28)

4 -X-master-at: 86ab15cb154862b6fa5cc646dac27532f881e1fb

5 -X-next-at: 6140810f5a86d69e4bee74d360b936fb4a8a3b1f

3 +Subject: What's cooking in git.git (Apr 2020, #04; Thu, 30)

4 +X-master-at: d61d20c9b413225793f8a0b491bbbec61c184e26

5 +X-next-at: e9eca65c58678cd6523f72e8b97b77f978a3477e

6

7 -What's cooking in git.git (Apr 2020, #03; Tue, 28)

7 +What's cooking in git.git (Apr 2020, #04; Thu, 30)

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

9

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

@@ -25,657 +25,202 @@ of the repositories listed at

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

26 [Graduated to "master"]

27

28 -* ag/rebase-merge-allow-ff-under-abbrev-command (2020-03-30) 2 commits

29 - (merged to 'next' on 2020-04-15 at b4679f7c7c)

30 - + t3432: test `--merge' with `rebase.abbreviateCommands = true', too

31 - + sequencer: don't abbreviate a command if it doesn't have a short form

32 -

33 - "git rebase" with the merge backend did not work well when the

34 - rebase.abbreviateCommands configuration was set.

35 -

36 -

37 -* ag/sequencer-i18n-messages (2020-03-28) 1 commit

38 - (merged to 'next' on 2020-04-15 at d6b38d12cf)

39 - + sequencer: mark messages for translation

40 -

41 - Message fix.

42 -

43 -

44 -* ak/run-command-on-cygwin-fix (2020-03-27) 1 commit

45 - (merged to 'next' on 2020-04-15 at 9e98b82a7f)

46 - + run-command: trigger PATH lookup properly on Cygwin

47 -

48 - Utitiles run via the run_command() API were not spawned correctly

49 - on Cygwin, when the paths to them are given as a full path with

50 - backslashes.

51 -

52 -

53 -* ar/test-style-fixes (2020-03-22) 2 commits

54 - (merged to 'next' on 2020-04-15 at 50ed75bccf)

55 - + t: fix whitespace around &&

56 - + t9500: remove spaces after redirect operators

57 -

58 - Style fixes.

59 -

60 -

61 -* bc/constant-memequal (2020-04-22) 2 commits

62 - (merged to 'next' on 2020-04-22 at 6d2b10b1e7)

63 - + receive-pack: compilation fix

64 - (merged to 'next' on 2020-04-20 at 31180dae7d)

65 - + builtin/receive-pack: use constant-time comparison for HMAC value

66 -

67 - Validation of push certificate has been made more robust against

68 - timing attacks.

69 -

70 -

71 -* bc/faq (2020-03-30) 1 commit

72 - (merged to 'next' on 2020-04-15 at 2d4c46ca7a)

73 - + docs: add a FAQ

74 -

75 - Doc update.

76 -

77 -

78 -* bk/p4-pre-edit-changelist (2020-02-14) 7 commits

79 - (merged to 'next' on 2020-04-15 at 3e7cecd445)

80 - + git-p4: add RCS keyword status message

81 - + git-p4: add p4 submit hooks

82 - + git-p4: restructure code in submit

83 - + git-p4: add --no-verify option

84 - + git-p4: add p4-pre-submit exit text

85 - + git-p4: create new function run_git_hook

86 - + git-p4: rewrite prompt to be Windows compatible

87 -

88 - "git p4" learned four new hooks and also "--no-verify" option to

89 - bypass them (and the existing "p4-pre-submit" hook).

90 -

91 -

92 -* dd/no-gpg-sign (2020-04-03) 6 commits

93 - (merged to 'next' on 2020-04-15 at 3a326e99af)

94 - + Documentation: document merge option --no-gpg-sign

95 - + Documentation: merge commit-tree --[no-]gpg-sign

96 - + Documentation: reword commit --no-gpg-sign

97 - + Documentation: document am --no-gpg-sign

98 - + cherry-pick/revert: honour --no-gpg-sign in all case

99 - + rebase.c: honour --no-gpg-sign

100 -

101 - "git rebase" learned the "--no-gpg-sign" option to countermand

102 - commit.gpgSign the user may have.

103 -

104 -

105 -* dd/test-with-busybox (2020-03-26) 8 commits

106 - (merged to 'next' on 2020-04-15 at 8177191066)

107 - + t5703: feed raw data into test-tool unpack-sideband

108 - + t4124: tweak test so that non-compliant diff(1) can also be used

109 - + t7063: drop non-POSIX argument "-ls" from find(1)

110 - + t5616: use rev-parse instead to get HEAD's object_id

111 - + t5003: skip conversion test if unzip -a is unavailable

112 - + t5003: drop the subshell in test_lazy_prereq

113 - + test-lib-functions: test_cmp: eval $GIT_TEST_CMP

114 - + t4061: use POSIX compliant regex(7)

28 +* dd/ci-musl-libc (2020-04-06) 6 commits

29 + + travis: build and test on Linux with musl libc and busybox

30 + + ci/linux32: libify install-dependencies step

31 + + ci: refactor docker runner script

32 + + ci/linux32: parameterise command to switch arch

33 + + ci/lib-docker: preserve required environment variables

34 + + ci: make MAKEFLAGS available inside the Docker container in the Linux32 job

35 (this branch is used by dd/ci-swap-azure-pipelines-with-github-actions.)

36

117 - Various tests have been updated to work around issues found with

118 - shell utilities that come with busybox etc.

119 -

120 -

121 -* dl/libify-a-few (2020-03-24) 2 commits

122 - (merged to 'next' on 2020-04-20 at 84eb704a32)

123 - + Lib-ify prune-packed

124 - + Lib-ify fmt-merge-msg

125 -

126 - Code in builtin/*, i.e. those can only be called from within

127 - built-in subcommands, that implements bulk of a couple of

128 - subcommands have been moved to libgit.a so that they could be used

129 - by others.

130 -

131 -

132 -* dl/test-must-fail-fixes-3 (2020-03-27) 8 commits

133 - (merged to 'next' on 2020-04-15 at dd0130c158)

134 - + t5801: teach compare_refs() to accept !

135 - + t5612: stop losing return codes of git commands

136 - + t5612: don't use `test_must_fail test_cmp`

137 - + t5607: reorder `nongit test_must_fail`

138 - + t5550: simplify no matching line check

139 - + t5512: stop losing return codes of git commands

140 - + t5512: stop losing git exit code in here-docs

141 - + t5512: don't use `test_must_fail test_cmp`

142 -

143 - Test clean-up continues.

144 -

145 -

146 -* dl/wrapper-fix-indentation (2020-03-28) 1 commit

147 - (merged to 'next' on 2020-04-15 at e6b9c16b1b)

148 - + wrapper: indent with tabs

149 -

150 - Coding style fix.

151 -

152 -

153 -* dr/doc-recurse-submodules (2020-04-06) 5 commits

154 - (merged to 'next' on 2020-04-20 at 601e10f9a1)

155 - + doc: --recurse-submodules mostly applies to active submodules

156 - + doc: be more precise on (fetch|push).recurseSubmodules

157 - + doc: explain how to deactivate submodule.recurse completely

158 - + doc: document --recurse-submodules for reset and restore

159 - + doc: list all commands affected by submodule.recurse

160 -

161 - Documentation updates around the "--recurse-submodules" option.

162 -

163 -

164 -* dr/midx-avoid-int-underflow (2020-03-28) 1 commit

165 - (merged to 'next' on 2020-04-15 at eb2343a5eb)

166 - + midx.c: fix an integer underflow

167 -

168 - When fed a midx that records no objects, some codepaths tried to

169 - loop from 0 through (num_objects-1), which, due to integer

170 - arithmetic wrapping around, made it nonsense operation with out of

171 - bounds array accesses. The code has been corrected to reject such

172 - an midx file.

173 -

174 -

175 -* ds/commit-graph-expiry-fix (2020-04-01) 1 commit

176 - (merged to 'next' on 2020-04-20 at 4afb3de947)

177 - + commit-graph: fix buggy --expire-time option

178 -

179 - "git commit-graph write --expire-time=<timestamp>" did not use the

180 - given timestamp correctly, which has been corrected.

181 -

182 -

183 -* ds/doc-clone-filter (2020-03-22) 1 commit

184 - (merged to 'next' on 2020-04-15 at 16276689b3)

185 - + clone: document --filter options

186 -

187 - Doc update.

188 -

189 -

190 -* ds/log-exclude-decoration-config (2020-04-16) 2 commits

191 - (merged to 'next' on 2020-04-22 at 7dc5fae7d9)

192 - + log: add log.excludeDecoration config option

193 - + log-tree: make ref_filter_match() a helper method

194 -

195 - The "--decorate-refs" and "--decorate-refs-exclude" options "git

196 - log" takes have learned a companion configuration variable

197 - log.excludeDecoration that sits at the lowest priority in the

198 - family.

199 -

200 -

201 -* ds/revision-show-pulls (2020-04-10) 1 commit

202 - (merged to 'next' on 2020-04-15 at 89b4d86a3a)

203 - + revision: --show-pulls adds helpful merges

204 -

205 - "git log" learned "--show-pulls" that helps pathspec limited

206 - history views; a merge commit that takes the whole change from a

207 - side branch, which is normally omitted from the output, is shown

208 - in addition to the commits that introduce real changes.

209 -

210 -

211 -* ds/t5319-touch-fix (2020-04-01) 1 commit

212 - (merged to 'next' on 2020-04-20 at 41ccdb3fcd)

213 - + t5319: replace 'touch -m' with 'test-tool chmtime'

214 -

215 - Tests update to use "test-chmtime" instead of "touch -t".

216 -

217 -

218 -* eb/format-patch-no-encode-headers (2020-04-07) 1 commit

219 - (merged to 'next' on 2020-04-15 at 368840cd6c)

220 - + format-patch: teach --no-encode-email-headers

221 -

222 - The output from "git format-patch" uses RFC 2047 encoding for

223 - non-ASCII letters on From: and Subject: headers, so that it can

224 - directly be fed to e-mail programs. A new option has been added

225 - to produce these headers in raw.

226 -

227 -

228 -* eb/mboxrd-doc (2020-04-15) 1 commit

229 - (merged to 'next' on 2020-04-22 at 8935542c17)

230 - + Documentation: explain "mboxrd" pretty format

231 -

232 - Doc update.

233 -

234 -

235 -* en/pull-do-not-rebase-after-fast-forwarding (2020-03-27) 1 commit

236 - (merged to 'next' on 2020-04-15 at 3aa725ff45)

237 - + pull: avoid running both merge and rebase

238 -

239 - "git pull --rebase" tried to run a rebase even after noticing that

240 - the pull results in a fast-forward and no rebase is needed nor

241 - sensible, for the past few years due to a mistake nobody noticed.

242 -

243 -

244 -* en/rebase-doc-hooks-called-by-accident (2020-04-05) 1 commit

245 - (merged to 'next' on 2020-04-20 at 1011f8a876)

246 - + git-rebase.txt: add another hook to the hooks section, and explain more

247 -

248 - "git rebase" happens to call some hooks meant for "checkout" and

249 - "commit" by this was not a designed behaviour than historical

250 - accident. This has been documented.

251 -

252 -

253 -* en/rebase-no-keep-empty (2020-04-11) 3 commits

254 - (merged to 'next' on 2020-04-15 at 9908cee7c0)

255 - + rebase: fix an incompatible-options error message

256 - + rebase: reinstate --no-keep-empty

257 - + rebase -i: mark commits that begin empty in todo editor

258 - (this branch is used by jt/rebase-allow-duplicate.)

259 -

260 - "git rebase" (again) learns to honor "--no-keep-empty", which lets

261 - the user to discard commits that are empty from the beginning (as

262 - opposed to the ones that become empty because of rebasing). The

263 - interactive rebase also marks commits that are empty in the todo.

264 -

265 -

266 -* en/sequencer-reflog-action (2020-04-07) 1 commit

267 - (merged to 'next' on 2020-04-15 at 6c635bdaa1)

268 - + sequencer: honor GIT_REFLOG_ACTION

269 -

270 - "git rebase -i" did not leave the reflog entries correctly.

271 -

272 -

273 -* jc/allow-strlen-substitution-in-shell-scripts (2020-03-29) 1 commit

274 - (merged to 'next' on 2020-04-15 at 262424efdc)

275 - + CodingGuidelines: allow ${#posix} == strlen($posix)

276 -

277 - Coding guideline update.

278 -

279 -

280 -* jc/doc-test-leaving-early (2020-03-29) 1 commit

281 - (merged to 'next' on 2020-04-20 at 4bd94585d1)

282 - + t/README: suggest how to leave test early with failure

283 -

284 - Document the recommended way to abort a failing test early (e.g. by

285 - exiting a loop), which is to say "return 1".

286 -

287 -

288 -* jc/gnu-hurd-lets-fread-read-dirs (2020-04-22) 1 commit

289 - (merged to 'next' on 2020-04-22 at 8cd50b8150)

290 - + config.mak.uname: Define FREAD_READS_DIRECTORIES for GNU/Hurd

291 -

292 - GNU/Hurd is also among the ones that need the fopen() wrapper.

293 -

294 -

295 -* jc/log-no-mailmap (2020-03-16) 3 commits

296 - (merged to 'next' on 2020-04-20 at b43968e73e)

297 - + log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap

298 - + clone: reorder --recursive/--recurse-submodules

299 - + parse-options: teach "git cmd -h" to show alias as alias

300 -

301 - "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"

302 -

303 -

304 -* jc/missing-ref-store-fix (2020-04-09) 2 commits

305 - (merged to 'next' on 2020-04-15 at 83caf48c7a)

306 - + repository: mark the "refs" pointer as private

307 - + sha1-name: do not assume that the ref store is initialized

308 -

309 - We've left the command line parsing of "git log :/a/b/" broken for

310 - about a full year without anybody noticing, which has been

311 - corrected.

312 -

313 -

314 -* jk/config-use-size-t (2020-04-10) 6 commits

315 - (merged to 'next' on 2020-04-20 at 4af9fea74f)

316 - + config: reject parsing of files over INT_MAX

317 - + config: use size_t to store parsed variable baselen

318 - + git_config_parse_key(): return baselen as size_t

319 - + config: drop useless length variable in write_pair()

320 - + parse_config_key(): return subsection len as size_t

321 - + remote: drop auto-strlen behavior of make_branch() and make_rewrite()

322 -

323 - The config API made mixed uses of int and size_t types to represent

324 - length of various pieces of text it parsed, which has been updated

325 - to use the correct type (i.e. size_t) throughout.

326 -

327 -

328 -* jk/credential-parsing-end-of-host-in-URL (2020-04-15) 1 commit

329 - (merged to 'next' on 2020-04-15 at 55bc3eb7cb)

330 - + credential: treat "?" and "#" in URLs as end of host

331 -

332 - Parsing of URL for the credential helper has been corrected.

333 -

334 -

335 -* jk/fast-import-use-hashmap (2020-04-06) 1 commit

336 - (merged to 'next' on 2020-04-20 at 76e8908efe)

337 - + fast-import: replace custom hash with hashmap.c

338 -

339 - The custom hash function used by "git fast-import" has been

340 - replaced with the one from hashmap.c, which gave us a nice

341 - performance boost.

342 -

343 -

344 -* jk/harden-protocol-v2-delim-handling (2020-03-29) 3 commits

345 - (merged to 'next' on 2020-04-15 at c983535405)

346 - + test-lib-functions: simplify packetize() stdin code

347 - + upload-pack: handle unexpected delim packets

348 - + test-lib-functions: make packetize() more efficient

349 -

350 - The server-end of the v2 protocol to serve "git clone" and "git

351 - fetch" was not prepared to see a delim packets at unexpected

352 - places, which led to a crash.

353 -

354 -

355 -* jk/oid-array-cleanups (2020-03-30) 7 commits

356 - (merged to 'next' on 2020-04-15 at d6155cd023)

357 - + oidset: stop referring to sha1-array

358 - + ref-filter: stop referring to "sha1 array"

359 - + bisect: stop referring to sha1_array

360 - + test-tool: rename sha1-array to oid-array

361 - + oid_array: rename source file from sha1-array

362 - + oid_array: use size_t for iteration

363 - + oid_array: use size_t for count and allocation

364 -

365 - Code cleanup.

366 -

367 -

368 -* jk/p5310-drop-non-bitmap-timing (2020-03-27) 1 commit

369 - (merged to 'next' on 2020-04-15 at 7aac76cab2)

370 - + p5310: stop timing non-bitmap pack-to-disk

371 -

372 - Perf-test update.

373 -

374 -

375 -* jk/t3419-drop-expensive-tests (2020-03-22) 1 commit

376 - (merged to 'next' on 2020-04-15 at a17ac8f996)

377 - + t3419: drop EXPENSIVE tests

378 -

379 - Test update.

380 -

381 -

382 -* jk/test-cleanup (2020-03-27) 2 commits

383 - (merged to 'next' on 2020-04-15 at bce8b2d5ed)

384 - + t/lib-*.sh: drop executable bit

385 - + t/lib-credential.sh: drop shebang line

386 -

387 - Test cleanup.

388 -

389 -

390 -* jk/use-quick-lookup-in-clone-for-tag-following (2020-04-01) 1 commit

391 - (merged to 'next' on 2020-04-15 at 11d6110e99)

392 - + clone: use "quick" lookup while following tags

393 -

394 - The logic to auto-follow tags by "git clone --single-branch" was

395 - not careful to avoid lazy-fetching unnecessary tags, which has been

396 - corrected.

397 -

398 -

399 -* jm/gitweb-fastcgi-utf8 (2020-03-29) 1 commit

400 - (merged to 'next' on 2020-04-15 at adb7f2373a)

401 - + gitweb: fix UTF-8 encoding when using CGI::Fast

402 -

403 - Gitweb update.

404 -

405 -

406 -* jn/demote-proto2-from-default (2020-04-22) 1 commit

407 - (merged to 'next' on 2020-04-22 at 1a5e0b221a)

408 - + Revert "fetch: default to protocol version 2"

409 -

410 - Those fetching over protocol v2 from linux-next and other kernel

411 - repositories are reporting that v2 often fetches way too much than

412 - needed.

413 -

414 -

415 -* js/flush-prompt-before-interative-input (2020-04-10) 2 commits

416 - (merged to 'next' on 2020-04-15 at 051407eb3a)

417 - + interactive: explicitly `fflush` stdout before expecting input

418 - + interactive: refactor code asking the user for interactive input

37 + A new CI job to build and run test suite on linux with musl libc

38 + has been added.

39

420 - The interactive input from various codepaths are consolidated and

421 - any prompt possibly issued earlier are fflush()ed before we read.

40

41 +* dd/ci-swap-azure-pipelines-with-github-actions (2020-04-10) 14 commits

42 + (merged to 'next' on 2020-04-20 at 40d0486c23)

43 + + ci: let GitHub Actions upload failed tests' directories

44 + + ci: add a problem matcher for GitHub Actions

45 + + tests: when run in Bash, annotate test failures with file name/line number

46 + + ci: retire the Azure Pipelines definition

47 + + README: add a build badge for the GitHub Actions runs

48 + + ci: configure GitHub Actions for CI/PR

49 + + ci: run gem with sudo to install asciidoctor

50 + + ci: explicit install all required packages

51 + + ci: fix the `jobname` of the `GETTEXT_POISON` job

52 + + ci/lib: set TERM environment variable if not exist

53 + + ci/lib: allow running in GitHub Actions

54 + + ci/lib: if CI type is unknown, show the environment variables

55 + + Merge branch 'dd/ci-musl-libc' into HEAD

56 + + Merge branch 'dd/test-with-busybox' into HEAD

57 + (this branch uses dd/ci-musl-libc.)

58

424 -* js/import-tars-do-not-make-phony-files-from-pax-headers (2020-03-24) 1 commit

425 - (merged to 'next' on 2020-04-15 at 408afae2c9)

426 - + import-tars: ignore the global PAX header

59 + Update the CI configuration to use GitHub Actions, retiring the one

60 + based on Azure Pipelines.

61

428 - The import-tars importer (in contrib/fast-import/) used to create

429 - phony files at the top-level of the repository when the archive

430 - contains global PAX headers, which made its own logic to detect and

431 - omit the common leading directory ineffective, which has been

432 - corrected.

62 + Will merge to 'master', together with dd/ci-musl-libc.

63

64

435 -* js/mingw-fixes (2020-04-10) 3 commits

436 - (merged to 'next' on 2020-04-15 at 11a3d39d2b)

437 - + mingw: help debugging by optionally executing bash with strace

438 - + mingw: do not treat `COM0` as a reserved file name

439 - + mingw: use modern strftime implementation if possible

65 +* dl/merge-autostash (2020-04-10) 22 commits

66 + (merged to 'next' on 2020-04-22 at 98b991e8f5)

67 + + pull: pass --autostash to merge

68 + + t5520: make test_pull_autostash() accept expect_parent_num

69 + + merge: teach --autostash option

70 + + sequencer: implement apply_autostash_oid()

71 + + sequencer: implement save_autostash()

72 + + sequencer: unlink autostash in apply_autostash()

73 + + sequencer: extract perform_autostash() from rebase

74 + + rebase: generify create_autostash()

75 + + rebase: extract create_autostash()

76 + + reset: extract reset_head() from rebase

77 + + rebase: generify reset_head()

78 + + rebase: use apply_autostash() from sequencer.c

79 + + sequencer: rename stash_sha1 to stash_oid

80 + + sequencer: make apply_autostash() accept a path

81 + + rebase: use read_oneliner()

82 + + sequencer: make read_oneliner() extern

83 + + sequencer: configurably warn on non-existent files

84 + + sequencer: make read_oneliner() accept flags

85 + + sequencer: make file exists check more efficient

86 + + sequencer: stop leaking buf

87 + + t7600: use test_write_lines()

88 + + Makefile: ASCII-sort += lists

89 + (this branch is used by dl/merge-autostash-rebase-quit-fix.)

90

441 - Misc fixes for Windows.

91 + "git merge" learns the "--autostash" option.

92

93 + Will merge to 'master' together with the "rebase --quit" fix.

94

444 -* js/mingw-is-hidden-test-fix (2020-04-11) 3 commits

445 - (merged to 'next' on 2020-04-15 at 1e11f552f7)

446 - + t: restrict `is_hidden` to be called only on Windows

447 - + mingw: make test_path_is_hidden more robust

448 - + t: consolidate the `is_hidden` functions

95

450 - A Windows-specific test element has been made more robust against

451 - misuse from both user's environment and programmer's errors.

96 +* dl/merge-autostash-rebase-quit-fix (2020-04-28) 1 commit

97 + (merged to 'next' on 2020-04-28 at 24dcf3edc1)

98 + + rebase: save autostash entry into stash reflog on --quit

99 + (this branch uses dl/merge-autostash.)

100

101 + The stash entry created by "git rebase --autosquash" to keep the

102 + initial dirty state were discarded by mistake upon "git rebase

103 + --quit", which has been corrected.

104

454 -* js/mingw-isilon-nfs (2020-04-10) 1 commit

455 - (merged to 'next' on 2020-04-15 at 4bac536980)

456 - + mingw: cope with the Isilon network file system

105

458 - Will merge to 'master'.

106 +* en/fill-directory-exponential (2020-04-01) 12 commits

107 + (merged to 'next' on 2020-04-22 at e2577e3dc9)

108 + + completion: fix 'git add' on paths under an untracked directory

109 + + Fix error-prone fill_directory() API; make it only return matches

110 + + dir: replace double pathspec matching with single in treat_directory()

111 + + dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()

112 + + dir: replace exponential algorithm with a linear one

113 + + dir: refactor treat_directory to clarify control flow

114 + + dir: fix confusion based on variable tense

115 + + dir: fix broken comment

116 + + dir: consolidate treat_path() and treat_one_path()

117 + + dir: fix simple typo in comment

118 + + t3000: add more testcases testing a variety of ls-files issues

119 + + t7063: more thorough status checking

120

121 + The directory traversal code had redundant recursive calls which

122 + made its performance characteristics exponential with respect to

123 + the depth of the tree, which was corrected.

124

461 -* js/stash-p-fix (2020-04-08) 2 commits

462 - (merged to 'next' on 2020-04-20 at 435bf60bd5)

463 - + stash -p: (partially) fix bug concerning split hunks

464 - + t3904: fix incorrect demonstration of a bug

125

466 - Allowing the user to split a patch hunk while "git stash -p" does

467 - not work well; a band-aid has been added to make this (partially)

468 - work better.

126 +* en/sparse-checkout (2020-03-27) 18 commits

127 + (merged to 'next' on 2020-04-15 at 3e295e445d)

128 + + sparse-checkout: provide a new reapply subcommand

129 + + unpack-trees: failure to set SKIP_WORKTREE bits always just a warning

130 + + unpack-trees: provide warnings on sparse updates for unmerged paths too

131 + + unpack-trees: make sparse path messages sound like warnings

132 + + unpack-trees: split display_error_msgs() into two

133 + + unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*

134 + + unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier

135 + + sparse-checkout: use improved unpack_trees porcelain messages

136 + + sparse-checkout: use new update_sparsity() function

137 + + unpack-trees: add a new update_sparsity() function

138 + + unpack-trees: pull sparse-checkout pattern reading into a new function

139 + + unpack-trees: do not mark a dirty path with SKIP_WORKTREE

140 + + unpack-trees: allow check_updates() to work on a different index

141 + + t1091: make some tests a little more defensive against failures

142 + + unpack-trees: simplify pattern_list freeing

143 + + unpack-trees: simplify verify_absent_sparse()

144 + + unpack-trees: remove unused error type

145 + + unpack-trees: fix minor typo in comment

146

147 + "sparse-checkout" UI improvements.

148

471 -* js/subtree-doc-update-to-asciidoctor-2 (2020-04-08) 1 commit

472 - (merged to 'next' on 2020-04-20 at db1ed7a858)

473 - + subtree: fix build with AsciiDoctor 2

149

475 - Doc markup update.

150 +* ps/transactional-update-ref-stdin (2020-04-02) 9 commits

151 + (merged to 'next' on 2020-04-22 at 5c92add109)

152 + + update-ref: implement interactive transaction handling

153 + + update-ref: read commands in a line-wise fashion

154 + + update-ref: move transaction handling into `update_refs_stdin()`

155 + + update-ref: pass end pointer instead of strbuf

156 + + update-ref: drop unused argument for `parse_refname`

157 + + update-ref: organize commands in an array

158 + + strbuf: provide function to append whole lines

159 + + git-update-ref.txt: add missing word

160 + + refs: fix segfault when aborting empty transaction

161

162 + "git update-ref --stdin" learned a handful of new verbs to let the

163 + user control ref update transactions more explicitly, which helps

164 + as an ingredient to implement two-phase commit-style atomic

165 + ref-updates across multiple repositories.

166

478 -* js/t0007-typofix (2020-04-05) 1 commit

479 - (merged to 'next' on 2020-04-15 at ac9f86e08f)

480 - + t0007: fix a typo

167 +--------------------------------------------------

168 +[New Topics]

169

482 - Typofix in a test script.

170 +* cb/credential-store-warn-bogus-lines (2020-04-28) 2 commits

171 + - credential-store: warn instead of fatal for bogus lines from store

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

173

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

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

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

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

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

179

485 -* js/test-junit-finalization-fix (2020-03-23) 1 commit

486 - (merged to 'next' on 2020-04-15 at 0d6a975146)

487 - + tests(junit-xml): avoid invalid XML

180

489 - Test fix.

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

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

183

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

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

186 + should be, which has been corrected.

187

492 -* js/tests-gpg-integration-on-windows (2020-03-26) 5 commits

493 - (merged to 'next' on 2020-04-15 at 48a13eb0b2)

494 - + tests: increase the verbosity of the GPG-related prereqs

495 - + tests: turn GPG, GPGSM and RFC1991 into lazy prereqs

496 - + tests: do not let lazy prereqs inside `test_expect_*` turn off tracing

497 - + t/lib-gpg.sh: stop pretending to be a stand-alone script

498 - + tests(gpg): allow the gpg-agent to start on Windows

188 + Will merge to 'next'.

189

500 - Enable tests that require GnuPG on Windows.

190

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

192 + - SQUASH???

193 + - bugreport: collect list of populated hooks

194 + (this branch uses es/bugreport.)

195

503 -* js/trace2-env-vars (2020-03-23) 1 commit

504 - (merged to 'next' on 2020-04-15 at 1aad0adfa0)

505 - + trace2: teach Git to log environment variables

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

197

507 - Trace2 enhancement to allow logging of the environment variables.

198 + Needs polishing the tests.

199

200

510 -* js/walk-doc-optim (2020-03-30) 1 commit

511 - (merged to 'next' on 2020-04-15 at ca36c04a23)

512 - + MyFirstObjectWalk: remove unnecessary conditional statement

201 +* tb/shallow-cleanup (2020-04-30) 4 commits

202 + - shallow: use struct 'shallow_lock' for additional safety

203 + - shallow.h: document '{commit,rollback}_shallow_file'

204 + - shallow: extract a header file for shallow-related functions

205 + - commit: make 'commit_graft_pos' non-static

206 + (this branch uses tb/reset-shallow.)

207

208 Code cleanup.

209

210 + Will merge to 'next'.

211

517 -* jt/avoid-prefetch-when-able-in-diff (2020-04-07) 4 commits

518 - (merged to 'next' on 2020-04-20 at 02b52c34bf)

519 - + diff: restrict when prefetching occurs

520 - + diff: refactor object read

521 - + diff: make diff_populate_filespec_options struct

522 - + promisor-remote: accept 0 as oid_nr in function

523 -

524 - "git diff" in a partial clone learned to avoid lazy loading blob

525 - objects in more casese when they are not needed.

526 -

527 -

528 -* jt/connectivity-check-optim-in-partial-clone (2020-03-29) 1 commit

529 - (merged to 'next' on 2020-04-15 at 1b3692b7fb)

530 - + connected: always use partial clone optimization

531 -

532 - Simplify the commit ancestry connectedness check in a partial clone

533 - repository in which "promised" objects are assumed to be obtainable

534 - lazily on-demand from promisor remote repositories.

535 -

536 -

537 -* jt/rebase-allow-duplicate (2020-04-11) 1 commit

538 - (merged to 'next' on 2020-04-15 at 56a9d83adf)

539 - + rebase --merge: optionally skip upstreamed commits

540 - (this branch uses en/rebase-no-keep-empty.)

541 -

542 - Allow "git rebase" to reapply all local commits, even if the may be

543 - already in the upstream, without checking first.

544 -

545 -

546 -* jx/atomic-push (2020-04-17) 5 commits

547 - (merged to 'next' on 2020-04-20 at 266d6934d8)

548 - + transport-helper: new method reject_atomic_push()

549 - + transport-helper: mark failure for atomic push

550 - + send-pack: mark failure of atomic push properly

551 - + t5543: never report what we do not push

552 - + send-pack: fix inconsistent porcelain output

553 -

554 - "git push --atomic" used to show failures for refs that weren't

555 - even pushed, which has been corrected.

556 -

557 -

558 -* lr/freshen-file-fix (2020-04-15) 1 commit

559 - (merged to 'next' on 2020-04-20 at e9370b0a81)

560 - + freshen_file(): use NULL `times' for implicit current-time

561 -

562 - The code that refreshes the last access and modified time of

563 - on-disk packfiles and loose object files have been updated.

564 -

565 -

566 -* lx/submodule-clear-variables (2020-04-02) 1 commit

567 - (merged to 'next' on 2020-04-20 at c18cd924c9)

568 - + git-submodule.sh: setup uninitialized variables

569 -

570 - The "git submodule" command did not initialize a few variables it

571 - internally uses and was affected by variable settings leaked from

572 - the environment.

573 -

574 -

575 -* ma/config-doc-fix (2020-04-09) 1 commit

576 - (merged to 'next' on 2020-04-15 at 256175ec38)

577 - + config.txt: move closing "----" to cover entire listing

578 -

579 - Doc update.

580 -

581 -

582 -* ma/doc-discard-docbook-xsl-1.73 (2020-03-31) 7 commits

583 - (merged to 'next' on 2020-04-20 at c280472e02)

584 - + user-manual.conf: don't specify [listingblock]

585 - + INSTALL: drop support for docbook-xsl before 1.74

586 - + manpage-normal.xsl: fold in manpage-base.xsl

587 - + manpage-bold-literal.xsl: stop using git.docbook.backslash

588 - + Doc: drop support for docbook-xsl before 1.73.0

589 - + Doc: drop support for docbook-xsl before 1.72.0

590 - + Doc: drop support for docbook-xsl before 1.71.1

591 -

592 - Raise the minimum required version of docbook-xsl package to 1.74,

593 - as 1.74.0 was from late 2008, which is more than 10 years old, and

594 - drop compatibility cruft from our documentation suite.

595 -

596 -

597 -* ma/simplify-merge-config-parsing (2020-04-11) 1 commit

598 - (merged to 'next' on 2020-04-15 at d2915301e4)

599 - + merge: use skip_prefix to parse config key

600 -

601 - Code simplification.

602 -

603 -

604 -* ms/doc-revision-illustration-fix (2020-04-21) 1 commit

605 - (merged to 'next' on 2020-04-22 at 245c0b78d5)

606 - + docs: fix minor glitch in illustration

607 -

608 - Docfix.

609 -

610 -

611 -* mt/grep-cquote-path (2020-04-20) 1 commit

612 - (merged to 'next' on 2020-04-22 at 55cf00e322)

613 - + grep: follow conventions for printing paths w/ unusual chars

614 -

615 - "git grep" did not quote a path with unusual character like other

616 - commands (like "git diff", "git status") do, but did quote when run

617 - from a subdirectory, both of which has been corrected.

618 -

619 -

620 -* mt/test-lib-bundled-short-options (2020-03-25) 1 commit

621 - (merged to 'next' on 2020-04-15 at 7fa0c56d91)

622 - + test-lib: allow short options to be bundled

623 -

624 - Minor test usability improvement.

625 -

626 -

627 -* pb/pull-fetch-doc (2020-04-05) 2 commits

628 - (merged to 'next' on 2020-04-15 at cf530f230f)

629 - + pull doc: correct outdated description of an example

630 - + pull doc: refer to a specific section in 'fetch' doc

631 -

632 - The more aggressive updates to remote-tracking branches we had for

633 - the past 7 years or so were not reflected in the documentation,

634 - which has been corrected.

635 -

636 -

637 -* pb/rebase-doc-typofix (2020-03-28) 1 commit

638 - (merged to 'next' on 2020-04-15 at 8cd8422990)

639 - + git-rebase.txt: fix typo

640 -

641 - Typofix.

642 -

643 -

644 -* rs/pull-options-sync-code-and-doc (2020-03-28) 2 commits

645 - (merged to 'next' on 2020-04-15 at d743f43034)

646 - + pull: pass documented fetch options on

647 - + pull: remove --update-head-ok from documentation

648 -

649 - "git pull" shares many options with underlying "git fetch", but

650 - some of them were not documented and some of those that would make

651 - sense to pass down were not passed down.

652 -

653 -

654 -* tb/diff-tree-with-notes (2020-04-20) 1 commit

655 - (merged to 'next' on 2020-04-22 at c06610c916)

656 - + diff-tree.c: load notes machinery when required

657 -

658 - "git diff-tree --pretty --notes" used to hit an assertion failure,

659 - as it forgot to initialize the notes subsystem.

660 -

661 -

662 -* tm/zsh-complete-switch-restore (2020-04-17) 1 commit

663 - (merged to 'next' on 2020-04-22 at 8c65d7f051)

664 - + complete: zsh: add missing sub cmd completion candidates

665 -

666 - zsh command line completion (in contrib/) update.

667 -

212 +--------------------------------------------------

213 +[Stalled]

214

669 -* vd/range-diff-with-custom-pretty-format-fix (2020-04-15) 2 commits

670 - (merged to 'next' on 2020-04-22 at da607b5dda)

671 - + range-diff: avoid negative string precision

672 - + range-diff: fix a crash in parsing git-log output

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

216 + - zlib.c: use size_t for size

217

674 - "git range-diff" fixes.

675 - cf. <20200416010734.GE36156@syl.local>

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

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

220 + updated to use "size_t".

221

222 --------------------------------------------------

678 -[New Topics]

223 +[Cooking]

224

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

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

@@ -699,11 +244,12 @@ of the repositories listed at

244 Will merge to 'master'.

245

246

702 -* ah/userdiff-markdown (2020-04-23) 1 commit

247 +* ah/userdiff-markdown (2020-04-30) 1 commit

248 - userdiff: support Markdown

249

705 - Expecting a reroll.

706 - cf. <C28ZA0MZKHK6.2CCZPZF15D32W@what>

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

251 +

252 + Will merge to 'next'.

253

254

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

@@ -741,6 +287,7 @@ of the repositories listed at

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

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

289 + t5537: use test_write_lines and indented heredocs for readability

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

291

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

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

@@ -764,7 +311,7 @@ of the repositories listed at

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

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

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

767 - (this branch uses tb/commit-graph-split-strategy.)

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

315

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

317 does not have to.

@@ -792,19 +339,29 @@ of the repositories listed at

339 Will merge to 'master'.

340

341

795 -* js/partial-urlmatch (2020-04-24) 3 commits

796 - - Sync with js/partial-urlmatch-2.17

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

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

344 - credential: optionally allow partial URLs in credential_from_url_gently()

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

345 + - credential: fix grammar

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

347 +

348 + Recent updates broke parsing of "credential.<url>.<key>" where

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

350 + stopped working, which has been corrected.

351

352 + Will merge to 'next'.

353

802 -* js/partial-urlmatch-2.17 (2020-04-24) 4 commits

803 - - SQUASH??? lose excess blank line to match the other side of the eventual merge

354 +

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

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

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

358 - credential: optionally allow partial URLs in credential_from_url_gently()

806 - - credential: fix grammar

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

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

360 +

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

362 + to avoid unnecessary merge conflicts.

363 +

364 + Will merge to 'next'.

365

366

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

@@ -826,10 +383,6 @@ of the repositories listed at

383 Will merge to 'master'.

384

385

829 -* jc/credential-store-file-format-doc (2020-04-27) 1 commit

830 - - credential-store: document the file format a bit more

831 -

832 -

386 * jk/complete-git-switch (2020-04-28) 11 commits

387 - completion: complete remote branches for git switch --track

388 - completion: recognize -c/-C when completing for git switch

@@ -870,30 +423,18 @@ of the repositories listed at

423 Will merge to 'master'.

424

425

873 -* tb/commit-graph-perm-bits (2020-04-27) 6 commits

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

875 - - commit-graph.c: ensure graph layers respect core.sharedRepository

876 - - SQUASH??? force known umask if you are going to check the resulting mode bits

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

878 - - lockfile.c: introduce 'hold_lock_file_for_update_mode'

879 - - tempfile.c: introduce 'create_tempfile_mode'

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

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

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

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

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

431 + + lockfile.c: introduce 'hold_lock_file_for_update_mode'

432 + + tempfile.c: introduce 'create_tempfile_mode'

433

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

435 correctly honor the core.sharedRepository settings and some were

436 left read-write.

437

885 - Expecting a reroll.

886 -

887 -

888 -* dl/merge-autostash-rebase-quit-fix (2020-04-28) 1 commit

889 - (merged to 'next' on 2020-04-28 at 24dcf3edc1)

890 - + rebase: save autostash entry into stash reflog on --quit

891 - (this branch uses dl/merge-autostash.)

892 -

893 - The stash entry created by "git rebase --autosquash" to keep the

894 - initial dirty state were discarded by mistake upon "git rebase

895 - --quit", which has been corrected.

896 -

438 Will merge to 'master'.

439

440

@@ -923,18 +464,6 @@ of the repositories listed at

464

465 Will merge to 'master'.

466

926 ---------------------------------------------------

927 -[Stalled]

928 -

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

930 - - zlib.c: use size_t for size

931 -

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

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

934 - updated to use "size_t".

935 -

936 ---------------------------------------------------

937 -[Cooking]

467

468 * dr/push-remoteref-fix (2020-04-23) 1 commit

469 - remote.c: fix handling of %(push:remoteref)

@@ -964,44 +493,15 @@ of the repositories listed at

493 Will merge to 'master'.

494

495

967 -* dd/ci-swap-azure-pipelines-with-github-actions (2020-04-10) 14 commits

968 - (merged to 'next' on 2020-04-20 at 40d0486c23)

969 - + ci: let GitHub Actions upload failed tests' directories

970 - + ci: add a problem matcher for GitHub Actions

971 - + tests: when run in Bash, annotate test failures with file name/line number

972 - + ci: retire the Azure Pipelines definition

973 - + README: add a build badge for the GitHub Actions runs

974 - + ci: configure GitHub Actions for CI/PR

975 - + ci: run gem with sudo to install asciidoctor

976 - + ci: explicit install all required packages

977 - + ci: fix the `jobname` of the `GETTEXT_POISON` job

978 - + ci/lib: set TERM environment variable if not exist

979 - + ci/lib: allow running in GitHub Actions

980 - + ci/lib: if CI type is unknown, show the environment variables

981 - + Merge branch 'dd/ci-musl-libc' into HEAD

982 - + Merge branch 'dd/test-with-busybox' into HEAD

983 - (this branch uses dd/ci-musl-libc.)

984 -

985 - Update the CI configuration to use GitHub Actions, retiring the one

986 - based on Azure Pipelines.

987 -

988 - Will merge to 'master', together with dd/ci-musl-libc.

989 -

990 -

991 -* pw/rebase-i-more-options (2020-04-07) 7 commits

992 - - SQUASH??? - avoid test numbering crashes

993 - - t3433: improve coverage

994 - - Revert "sequencer: allow callers of read_author_script() to ignore fields"

995 - - rebase -i: fix --committer-date-is-author-date

996 - - t3433: only compare commit dates

997 - - t3433: remove loops from tests

998 - - Revert "Revert "Merge branch 'ra/rebase-i-more-options'""

496 +* pw/rebase-i-more-options (2020-04-29) 5 commits

497 + - rebase: add --reset-author-date

498 + - rebase -i: support --ignore-date

499 + - sequencer: rename amend_author to author_to_free

500 + - rebase -i: support --committer-date-is-author-date

501 + - rebase -i: add --ignore-whitespace flag

502

503 "git rebase -i" learns a bit more options.

504

1002 - Expecting a reroll.

1003 - cf. <43d06bc0-b2ee-0ae6-f22c-9850e4033d45@gmail.com>

1004 -

505

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

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

@@ -1032,7 +532,9 @@ of the repositories listed at

532 Will merge to 'master'.

533

534

1035 -* tb/commit-graph-split-strategy (2020-04-15) 7 commits

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

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

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

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

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

540 + oidset: introduce 'oidset_size'

@@ -1040,12 +542,12 @@ of the repositories listed at

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

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

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

1043 - (this branch is used by tb/commit-graph-fd-exhaustion-fix.)

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

546

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

548 files.

549

1048 - Will merge to 'master'.

550 + Will merge to 'master' together with tb/commit-graph-fd-exhaustion-fix

551

552

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

@@ -1089,21 +591,6 @@ of the repositories listed at

591 outsource most of the ref updates to the new "proc-receive" hook.

592

593

1092 -* dd/ci-musl-libc (2020-04-06) 6 commits

1093 - + travis: build and test on Linux with musl libc and busybox

1094 - + ci/linux32: libify install-dependencies step

1095 - + ci: refactor docker runner script

1096 - + ci/linux32: parameterise command to switch arch

1097 - + ci/lib-docker: preserve required environment variables

1098 - + ci: make MAKEFLAGS available inside the Docker container in the Linux32 job

1099 - (this branch is used by dd/ci-swap-azure-pipelines-with-github-actions.)

1100 -

1101 - A new CI job to build and run test suite on linux with musl libc

1102 - has been added.

1103 -

1104 - Will merge to 'master'.

1105 -

1106 -

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

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

596 + Makefile: avoid running curl-config unnecessarily

@@ -1117,105 +604,6 @@ of the repositories listed at

604 cf. <20200428033611.GB2369457@coredump.intra.peff.net>

605

606

1120 -* ps/transactional-update-ref-stdin (2020-04-02) 9 commits

1121 - (merged to 'next' on 2020-04-22 at 5c92add109)

1122 - + update-ref: implement interactive transaction handling

1123 - + update-ref: read commands in a line-wise fashion

1124 - + update-ref: move transaction handling into `update_refs_stdin()`

1125 - + update-ref: pass end pointer instead of strbuf

1126 - + update-ref: drop unused argument for `parse_refname`

1127 - + update-ref: organize commands in an array

1128 - + strbuf: provide function to append whole lines

1129 - + git-update-ref.txt: add missing word

1130 - + refs: fix segfault when aborting empty transaction

1131 -

1132 - "git update-ref --stdin" learned a handful of new verbs to let the

1133 - user control ref update transactions more explicitly, which helps

1134 - as an ingredient to implement two-phase commit-style atomic

1135 - ref-updates across multiple repositories.

1136 -

1137 - Will merge to 'master'.

1138 -

1139 -

1140 -* en/fill-directory-exponential (2020-04-01) 12 commits

1141 - (merged to 'next' on 2020-04-22 at e2577e3dc9)

1142 - + completion: fix 'git add' on paths under an untracked directory

1143 - + Fix error-prone fill_directory() API; make it only return matches

1144 - + dir: replace double pathspec matching with single in treat_directory()

1145 - + dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()

1146 - + dir: replace exponential algorithm with a linear one

1147 - + dir: refactor treat_directory to clarify control flow

1148 - + dir: fix confusion based on variable tense

1149 - + dir: fix broken comment

1150 - + dir: consolidate treat_path() and treat_one_path()

1151 - + dir: fix simple typo in comment

1152 - + t3000: add more testcases testing a variety of ls-files issues

1153 - + t7063: more thorough status checking

1154 -

1155 - The directory traversal code had redundant recursive calls which

1156 - made its performance characteristics exponential with respect to

1157 - the depth of the tree, which was corrected.

1158 -

1159 - Will merge to 'master'.

1160 -

1161 -

1162 -* en/sparse-checkout (2020-03-27) 18 commits

1163 - (merged to 'next' on 2020-04-15 at 3e295e445d)

1164 - + sparse-checkout: provide a new reapply subcommand

1165 - + unpack-trees: failure to set SKIP_WORKTREE bits always just a warning

1166 - + unpack-trees: provide warnings on sparse updates for unmerged paths too

1167 - + unpack-trees: make sparse path messages sound like warnings

1168 - + unpack-trees: split display_error_msgs() into two

1169 - + unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*

1170 - + unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier

1171 - + sparse-checkout: use improved unpack_trees porcelain messages

1172 - + sparse-checkout: use new update_sparsity() function

1173 - + unpack-trees: add a new update_sparsity() function

1174 - + unpack-trees: pull sparse-checkout pattern reading into a new function

1175 - + unpack-trees: do not mark a dirty path with SKIP_WORKTREE

1176 - + unpack-trees: allow check_updates() to work on a different index

1177 - + t1091: make some tests a little more defensive against failures

1178 - + unpack-trees: simplify pattern_list freeing

1179 - + unpack-trees: simplify verify_absent_sparse()

1180 - + unpack-trees: remove unused error type

1181 - + unpack-trees: fix minor typo in comment

1182 -

1183 - "sparse-checkout" UI improvements.

1184 -

1185 - Will merge to 'master'.

1186 -

1187 -

1188 -* dl/merge-autostash (2020-04-10) 22 commits

1189 - (merged to 'next' on 2020-04-22 at 98b991e8f5)

1190 - + pull: pass --autostash to merge

1191 - + t5520: make test_pull_autostash() accept expect_parent_num

1192 - + merge: teach --autostash option

1193 - + sequencer: implement apply_autostash_oid()

1194 - + sequencer: implement save_autostash()

1195 - + sequencer: unlink autostash in apply_autostash()

1196 - + sequencer: extract perform_autostash() from rebase

1197 - + rebase: generify create_autostash()

1198 - + rebase: extract create_autostash()

1199 - + reset: extract reset_head() from rebase

1200 - + rebase: generify reset_head()

1201 - + rebase: use apply_autostash() from sequencer.c

1202 - + sequencer: rename stash_sha1 to stash_oid

1203 - + sequencer: make apply_autostash() accept a path

1204 - + rebase: use read_oneliner()

1205 - + sequencer: make read_oneliner() extern

1206 - + sequencer: configurably warn on non-existent files

1207 - + sequencer: make read_oneliner() accept flags

1208 - + sequencer: make file exists check more efficient

1209 - + sequencer: stop leaking buf

1210 - + t7600: use test_write_lines()

1211 - + Makefile: ASCII-sort += lists

1212 - (this branch is used by dl/merge-autostash-rebase-quit-fix.)

1213 -

1214 - "git merge" learns the "--autostash" option.

1215 -

1216 - Will merge to 'master' together with the "rebase --quit" fix.

1217 -

1218 -

607 * hn/reftable (2020-04-27) 12 commits

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

609 - Add some reftable testing infrastructure

@@ -1249,6 +637,7 @@ of the repositories listed at

637 + bugreport: gather git version and build info

638 + bugreport: add tool to generate debugging info

639 + help: move list_config_help to builtin/help

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

641

642 The "bugreport" tool.

643

@@ -1257,30 +646,7 @@ of the repositories listed at

646 --------------------------------------------------

647 [Discarded]

648

1260 -* jc/rebase-backend-keep-old-default (2020-03-10) 1 commit

1261 - . rebase: do not switch the default to 'merge' just yet

1262 -

1263 - The "merge" backend of "git rebase" still has a few bugs and

1264 - unexpected behaviour that need to be ironed out before it becomes

1265 - the default. Let's switch the default back to the "apply" backend

1266 - for now.

1267 -

1268 -

1269 -* vn/reset-deleted-ita (2019-07-26) 1 commit

1270 - . reset: unstage empty deleted ita files

1271 -

1272 - "git reset HEAD [<pathspec>]" did not reset an empty file that was

1273 - added with the intent-to-add bit.

1274 -

1275 -

1276 -* tb/commit-graph-split-merge (2020-03-24) 3 commits

1277 - (merged to 'next' on 2020-03-31 at 2183baf09c)

1278 - + builtin/commit-graph.c: support '--input=graphed'

1279 - + builtin/commit-graph.c: introduce '--input=<source>'

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

1281 -

1282 - The code to write out the commit-graph has been taught a few

1283 - options to control if the resulting graph chains should be merged

1284 - or a single new incremental graph is created.

649 +* jc/credential-store-file-format-doc (2020-04-27) 1 commit

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

651

1286 - Discarded---tb/commit-graph-split-strategy supersedes this.

652 + Now has become a part of Carlo's credential-store fix patches.

What's cooking (2020/04 #04)