265eda52b8 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2019, #03; Sun, 29)

4 -X-master-at: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a

5 -X-next-at: 8ccfaed27d6c89e154e3108c800de8de15b1981d

3 +Subject: What's cooking in git.git (Oct 2019, #01; Thu, 3)

4 +X-master-at: bc12974a897308fd3254cf0cc90319078fe45eea

5 +X-next-at: a346b79a78d4d9c875ed7b855047fb83dcacf05a

6

7 -What's cooking in git.git (Sep 2019, #03; Sun, 29)

7 +What's cooking in git.git (Oct 2019, #01; Thu, 3)

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

9

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

@@ -23,165 +23,415 @@ of the repositories listed at

23 --------------------------------------------------

24 [New Topics]

25

26 -* jt/merge-recursive-symlink-is-not-a-dir-in-way (2019-09-20) 1 commit

27 - - merge-recursive: symlink's descendants not in way

26 +* ag/sequencer-todo-updates (2019-10-02) 5 commits

27 + - sequencer: directly call pick_commits() from complete_action()

28 + - rebase: fill `squash_onto' in get_replay_opts()

29 + - sequencer: move the code writing total_nr on the disk to a new function

30 + - sequencer: update `done_nr' when skipping commands in a todo list

31 + - sequencer: update `total_nr' when adding an item to a todo list

32

29 - A bug in merge-recursive code that triggers when a branch with a

30 - symbolic link is merged with a branch that replaces it with a

31 - directory has been fixed.

33 + Expecting a reroll.

34 + cf. <nycvar.QRO.7.76.6.1910021018360.46@tvgsbejvaqbjf.bet> to clarify log messages.

35 + there may be others.

36 +

37 +

38 +* ah/cleanups (2019-10-03) 4 commits

39 + - git_mkstemps_mode(): replace magic numbers with computed value

40 + - wrapper: use a loop instead of repetitive statements

41 + - diffcore-break: use a goto instead of a redundant if statement

42 + - commit-graph: remove a duplicate assignment

43 +

44 + Miscellaneous code clean-ups.

45

46 Will merge to 'next'.

47

48

36 -* ps/my-first-contribution-alphasort (2019-09-28) 1 commit

37 - - doc: MyFirstContribution: fix cmd placement instructions

49 +* as/shallow-slab-use-fix (2019-10-02) 1 commit

50 + - shallow.c: don't free unallocated slabs

51

39 - Docfix.

52 + Correct code that tried to reference all entries in a sparse array

53 + of pointers by mistake.

54

55 Will merge to 'next'.

56

57

44 -* rs/alias-use-copy-array (2019-09-20) 1 commit

45 - - git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

58 +* js/fetch-jobs (2019-10-02) 1 commit

59 + - fetch: let --jobs=<n> parallelize --multiple, too

60

47 - Code cleanup.

61 + "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching

62 + submodules, but this did not apply to "git fetch --multiple" that

63 + fetches from multiple remote repositories. It now does.

64

65 Will merge to 'next'.

66

67

52 -* sg/t-helper-gitignore (2019-09-20) 1 commit

53 - - t/helper: ignore only executable files

68 +* js/mingw-spawn-with-spaces-in-path (2019-10-02) 1 commit

69 + - t0061: fix test for argv[0] with spaces (MINGW only)

70

55 - Update the way build artifacts in t/helper/ directory are ignored.

71 + Test fix.

72

73 Will merge to 'next'.

74

75

60 -* sg/travis-help-debug (2019-09-28) 1 commit

61 - - travis-ci: do not skip successfully tested trees in debug mode

76 +* gs/commit-graph-trace-with-cmd (2019-10-02) 1 commit

77 + - commit-graph: emit trace2 cmd_mode for each sub-command

78

63 - Dev support update.

79 + Dev support.

80

81 Will merge to 'next'.

82

83

68 -* am/mailmap-andrey-mazo (2019-09-20) 1 commit

69 - - .mailmap: update email address of Andrey Mazo

84 +* js/trace2-fetch-push (2019-10-03) 2 commits

85 + - push: add trace2 instrumentation

86 + - fetch: add trace2 instrumentation

87 +

88 + Dev support.

89

90 Will merge to 'next'.

91

92

74 -* am/t0028-utf16-tests (2019-09-28) 2 commits

75 - - t0028: add more tests

76 - - t0028: fix test for UTF-16-LE-BOM

93 +* js/range-diff-noprefix (2019-10-03) 1 commit

94 + - range-diff: internally force `diff.noprefix=true`

95

78 - Test fixes.

96 + "git range-diff" segfaulted when diff.noprefix configuration was

97 + used, as it blindly expected the patch it internally generates to

98 + have the standard a/ and b/ prefixes. The command now forces the

99 + internal patch to be built without any prefix, not to be affected

100 + by any end-user configuration.

101

102 + Will merge to 'next'.

103

81 -* am/visual-studio-config-fix (2019-09-28) 1 commit

82 - - contrib/buildsystems: fix Visual Studio Debug configuration

104 +--------------------------------------------------

105 +[Graduated to "master"]

106

84 - Dev support.

107 +* ar/mingw-run-external-with-non-ascii-path (2019-08-26) 1 commit

108 + (merged to 'next' on 2019-09-09 at 1973826628)

109 + + mingw: fix launching of externals from Unicode paths

110

86 - Will merge to 'next'.

111 + Windows update.

112

113

89 -* cb/do-not-use-test-cmp-with-a (2019-09-28) 1 commit

90 - - t4038: Remove non-portable '-a' option passed to test_cmp

114 +* bc/hash-independent-tests-part-5 (2019-08-26) 14 commits

115 + (merged to 'next' on 2019-09-09 at 49defc07af)

116 + + t4009: make hash size independent

117 + + t4002: make hash independent

118 + + t4000: make hash size independent

119 + + t3903: abstract away SHA-1-specific constants

120 + + t3800: make hash-size independent

121 + + t3600: make hash size independent

122 + + t3506: make hash independent

123 + + t3430: avoid hard-coded object IDs

124 + + t3404: abstract away SHA-1-specific constants

125 + + t3306: abstract away SHA-1-specific constants

126 + + t3305: make hash size independent

127 + + t3301: abstract away SHA-1-specific constants

128 + + t3206: abstract away hash size constants

129 + + t3201: abstract away SHA-1-specific constants

130

92 - Test portability fix.

131 + Preparation for SHA-256 upgrade continues in the test department.

132

94 - Will merge to 'next'.

133

134 +* bw/rebase-autostash-keep-current-branch (2019-09-07) 2 commits

135 + (merged to 'next' on 2019-09-18 at 6d8ed846ed)

136 + + builtin/rebase.c: Remove pointless message

137 + + builtin/rebase.c: make sure the active branch isn't moved when autostashing

138

97 -* cc/multi-promisor (2019-09-28) 1 commit

98 - - promisor-remote.h: drop extern from function declaration

139 + "git rebase --autostash <upstream> <branch>", when <branch> is

140 + different from the current branch, incorrectly moved the tip of the

141 + current branch, which has been corrected.

142

100 - Cleanup.

143

102 - Will merge to 'next'.

144 +* dl/compat-cleanup (2019-09-05) 2 commits

145 + (merged to 'next' on 2019-09-09 at e33c896e16)

146 + + compat/*.[ch]: remove extern from function declarations using spatch

147 + + mingw: apply array.cocci rule

148 + (this branch is used by dl/cocci-everywhere.)

149

150 + Code cleanup.

151

105 -* dl/honor-cflags-in-hdr-check (2019-09-28) 4 commits

106 - - Makefile: emulate compile in $(HCO) target better

107 - - pack-bitmap.h: remove magic number

108 - - promisor-remote.h: include missing header

109 - - apply.h: include missing header

152

111 - Dev support.

153 +* dl/complete-cherry-pick-revert-skip (2019-08-27) 3 commits

154 + (merged to 'next' on 2019-09-18 at 7dd173f824)

155 + + status: mention --skip for revert and cherry-pick

156 + + completion: add --skip for cherry-pick and revert

157 + + completion: merge options for cherry-pick and revert

158

113 - Will merge to 'next'.

159 + The command line completion support (in contrib/) learned about the

160 + "--skip" option of "git revert" and "git cherry-pick".

161 +

162 +

163 +* dl/format-patch-doc-test-cleanup (2019-09-05) 13 commits

164 + (merged to 'next' on 2019-09-09 at b3022b4002)

165 + + config/format.txt: specify default value of format.coverLetter

166 + + Doc: add more detail for git-format-patch

167 + + t4014: stop losing return codes of git commands

168 + + t4014: remove confusing pipe in check_threading()

169 + + t4014: use test_line_count() where possible

170 + + t4014: let sed open its own files

171 + + t4014: drop redirections to /dev/null

172 + + t4014: use indentable here-docs

173 + + t4014: remove spaces after redirect operators

174 + + t4014: use sq for test case names

175 + + t4014: move closing sq onto its own line

176 + + t4014: s/expected/expect/

177 + + t4014: drop unnecessary blank lines from test cases

178 + (this branch is used by dl/format-patch-cover-letter-subject.)

179

180 + The documentation and tests for "git format-patch" have been

181 + cleaned up.

182

116 -* en/fast-imexport-nested-tags (2019-09-28) 8 commits

117 - . fast-export: handle nested tags

118 - . t9350: add tests for tags of things other than a commit

119 - . fast-export: allow user to request tags be marked with --mark-tags

120 - . fast-export: add support for --import-marks-if-exists

121 - . fast-import: add support for new 'alias' command

122 - . fast-import: allow tags to be identified by mark labels

123 - . fast-import: fix handling of deleted tags

124 - . fast-export: fix exporting a tag and nothing else

183

126 - Updates to fast-import/export.

184 +* dl/rebase-i-keep-base (2019-08-27) 9 commits

185 + (merged to 'next' on 2019-09-18 at f94f486724)

186 + + rebase: teach rebase --keep-base

187 + + rebase tests: test linear branch topology

188 + + rebase: fast-forward --fork-point in more cases

189 + + rebase: fast-forward --onto in more cases

190 + + rebase: refactor can_fast_forward into goto tower

191 + + t3432: test for --no-ff's interaction with fast-forward

192 + + t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests

193 + + t3432: test rebase fast-forward behavior

194 + + t3431: add rebase --fork-point tests

195

128 - Seems to break t9300 when merged to 'pu'.

196 + "git rebase --keep-base <upstream>" tries to find the original base

197 + of the topic being rebased and rebase on top of that same base,

198 + which is useful when running the "git rebase -i" (and its limited

199 + variant "git rebase -x").

200

201 + The command also has learned to fast-forward in more cases where it

202 + can instead of replaying to recreate identical commits.

203

131 -* js/diff-rename-force-stable-sort (2019-09-28) 2 commits

132 - - diffcore_rename(): use a stable sort

133 - - Move git_sort(), a stable sort, into into libgit.a

204

135 - The rename detection logic sorts a list of rename source candidates

136 - by similarity to pick the best candidate, which means that a tie

137 - between sources with the same similarity is broken by the original

138 - location in the original canidate list (which is sorted by path).

139 - Force the sorting by similarity done with a stable sort, which is

140 - not promised by system supplied qsort(3), to ensure consistent

141 - results across platforms.

205 +* dl/use-sq-from-test-lib (2019-09-06) 1 commit

206 + (merged to 'next' on 2019-09-09 at 9a6619ddab)

207 + + t: use common $SQ variable

208

143 - Except for a minor nit, this looked OK.

209 + Code cleanup.

210

211

146 -* ma/user-manual-markup-update (2019-09-28) 4 commits

147 - - user-manual.txt: render ASCII art correctly under Asciidoctor

148 - - asciidoctor-extensions.rb: handle "book" doctype in linkgit

149 - - user-manual.txt: change header notation

150 - - user-manual.txt: add missing section label

212 +* ds/commit-graph-on-fetch (2019-09-03) 1 commit

213 + (merged to 'next' on 2019-09-18 at 10702dd989)

214 + + fetch: add fetch.writeCommitGraph config setting

215

152 - The markup used in user-manual has been updated to work better with

153 - asciidoctor.

216 + A configuration variable tells "git fetch" to write the commit

217 + graph after finishing.

218

155 - Will merge to 'next'.

219

220 +* ds/include-exclude (2019-09-05) 5 commits

221 + (merged to 'next' on 2019-09-18 at 1a3655a089)

222 + + unpack-trees: rename 'is_excluded_from_list()'

223 + + treewide: rename 'exclude' methods to 'pattern'

224 + + treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'

225 + + treewide: rename 'struct exclude_list' to 'struct pattern_list'

226 + + treewide: rename 'struct exclude' to 'struct path_pattern'

227

158 -* sg/name-rev-cutoff-underflow-fix (2019-09-28) 1 commit

159 - - name-rev: avoid cutoff timestamp underflow

228 + The internal code originally invented for ".gitignore" processing

229 + got reshuffled and renamed to make it less tied to "excluding" and

230 + stress more that it is about "matching", as it has been reused for

231 + things like sparse checkout specification that want to check if a

232 + path is "included".

233

161 - Integer arith fix.

234

163 - Will merge to 'next'.

235 +* dt/remote-helper-doc-re-lock-option (2019-08-30) 1 commit

236 + (merged to 'next' on 2019-09-09 at 970488992a)

237 + + clarify documentation for remote helpers

238

239 + Doc update.

240

166 -* tk/git-svn-trim-author-name (2019-09-28) 1 commit

167 - - git-svn: trim leading and trailing whitespaces in author name

241

169 - The author names taken from SVN repositories may have extra leading

170 - or trailing whitespaces, which are now munged away.

242 +* en/filter-branch-deprecation (2019-09-05) 3 commits

243 + (merged to 'next' on 2019-09-09 at 311ed09ba8)

244 + + t9902: use a non-deprecated command for testing

245 + + Recommend git-filter-repo instead of git-filter-branch

246 + + t6006: simplify, fix, and optimize empty message test

247

172 - Will merge to 'next'.

248 + Start discouraging the use of "git filter-branch".

249

250

175 -* bw/submodule-helper-usage-fix (2019-09-29) 1 commit

176 - - builtin/submodule--helper: fix usage string for 'update-clone'

251 +* en/merge-options-ff-and-friends (2019-09-01) 1 commit

252 + (merged to 'next' on 2019-09-09 at b3bcc2cbc7)

253 + + merge-options.txt: clarify meaning of various ff-related options

254

178 - Typofix.

255 + Doc update.

256 +

257 +

258 +* jc/test-cleanup (2019-09-05) 2 commits

259 + (merged to 'next' on 2019-09-09 at 41ced23598)

260 + + t3005: remove unused variable

261 + + t: use LF variable defined in the test harness

262 +

263 + Code cleanup.

264 +

265 +

266 +* jh/trace2-pretty-output (2019-08-09) 7 commits

267 + (merged to 'next' on 2019-09-18 at 503974aa46)

268 + + trace2: cleanup whitespace in perf format

269 + + trace2: cleanup whitespace in normal format

270 + + quote: add sq_append_quote_argv_pretty()

271 + + trace2: trim trailing whitespace in normal format error message

272 + + trace2: remove dead code in maybe_add_string_va()

273 + + trace2: trim whitespace in region messages in perf target format

274 + + trace2: cleanup column alignment in perf target format

275 +

276 + Output from trace2 subsystem is formatted more prettily now.

277 +

278 +

279 +* jk/fast-import-history-bugfix (2019-08-27) 2 commits

280 + (merged to 'next' on 2019-09-09 at eeef864077)

281 + + fast-import: duplicate into history rather than passing ownership

282 + + fast-import: duplicate parsed encoding string

283 +

284 + The memory ownership model of the "git fast-import" got

285 + straightened out.

286 +

287 +

288 +* jk/misc-uninitialized-fixes (2019-09-06) 6 commits

289 + (merged to 'next' on 2019-09-09 at 39ccd21475)

290 + + pack-objects: drop packlist index_pos optimization

291 + + test-read-cache: drop namelen variable

292 + + diff-delta: set size out-parameter to 0 for NULL delta

293 + + bulk-checkin: zero-initialize hashfile_checkpoint

294 + + pack-objects: use object_id in packlist_alloc()

295 + + git-am: handle missing "author" when parsing commit

296 +

297 + Various fixes to codepaths gcc 9 had trouble following dataflow.

298 +

299 +

300 +* js/gitdir-at-unc-root (2019-08-26) 3 commits

301 + (merged to 'next' on 2019-09-09 at 70ccc59b4b)

302 + + setup_git_directory(): handle UNC root paths correctly

303 + + Fix .git/ discovery at the root of UNC shares

304 + + setup_git_directory(): handle UNC paths correctly

305 +

306 + On Windows, the root level of UNC share is now allowed to be used

307 + just like any other directory.

308 +

309 +

310 +* js/visual-studio (2019-09-05) 1 commit

311 + (merged to 'next' on 2019-09-09 at 5493ee9474)

312 + + .gitignore: stop ignoring `.manifest` files

313 +

314 + Adjust .gitignore to unignore a path that we started to track.

315 +

316 +

317 +* mh/http-urlmatch-cleanup (2019-08-26) 1 commit

318 + (merged to 'next' on 2019-09-09 at 9971b626f1)

319 + + http: don't leak urlmatch_config.vars

320 +

321 + Leakfix.

322 +

323 +

324 +* mh/notes-duplicate-entries (2019-08-26) 2 commits

325 + (merged to 'next' on 2019-09-09 at 6c44967c97)

326 + + notes: avoid potential use-after-free during insertion

327 + + notes: avoid leaking duplicate entries

328 +

329 + A few implementation fixes in the notes API.

330

180 - Will merge to 'next'.

331 +

332 +* mh/release-commit-memory-fix (2019-08-26) 1 commit

333 + (merged to 'next' on 2019-09-09 at 9fb7485032)

334 + + commit: free the right buffer in release_commit_memory

335 +

336 + Leakfix.

337 +

338 +

339 +* nd/switch-and-restore (2019-08-30) 1 commit

340 + (merged to 'next' on 2019-09-09 at 97e7e06801)

341 + + checkout: add simple check for 'git checkout -b'

342 +

343 + Resurrect a performance hack.

344 +

345 +

346 +* rs/get-tagged-oid (2019-09-05) 2 commits

347 + (merged to 'next' on 2019-09-09 at 0e9489a835)

348 + + use get_tagged_oid()

349 + + tag: factor out get_tagged_oid()

350 +

351 + Code cleanup.

352 +

353 +

354 +* rs/help-unknown-ref-does-not-return (2019-08-30) 1 commit

355 + (merged to 'next' on 2019-09-09 at 4b00ea1ac9)

356 + + help: make help_unknown_ref() NORETURN

357 +

358 + Code cleanup.

359 +

360 +

361 +* rs/parse-tree-indirect (2019-09-03) 1 commit

362 + (merged to 'next' on 2019-09-09 at 157e836dba)

363 + + tree: simplify parse_tree_indirect()

364 +

365 + Code cleanup.

366 +

367 +

368 +* rs/strbuf-detach (2019-08-26) 2 commits

369 + (merged to 'next' on 2019-09-09 at f6bba7d52f)

370 + + grep: use return value of strbuf_detach()

371 + + log-tree: always use return value of strbuf_detach()

372 +

373 + Straighten out the use of strbuf_detach() API function.

374 +

375 +

376 +* rs/trace2-dst-warning (2019-08-26) 1 commit

377 + (merged to 'next' on 2019-09-09 at 13893cdf8c)

378 + + trace2: use warning() directly in tr2_dst_malformed_warning()

379 +

380 + Code cleanup.

381 +

382 +

383 +* sg/clean-nested-repo-with-ignored (2019-08-26) 1 commit

384 + (merged to 'next' on 2019-09-18 at 0da1269f07)

385 + + t7300-clean: demonstrate deleting nested repo with an ignored file breakage

386 + (this branch is used by en/clean-nested-with-ignored.)

387 +

388 + A bug documentation.

389 +

390 +

391 +* sg/git-test-boolean (2019-09-06) 2 commits

392 + (merged to 'next' on 2019-09-09 at 90406d6375)

393 + + ci: restore running httpd tests

394 + + t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests

395 +

396 + Fix an earlier regression in the test suite, which mistakenly

397 + stopped running HTTPD tests.

398 +

399 +

400 +* tb/banned-vsprintf-namefix (2019-08-26) 1 commit

401 + (merged to 'next' on 2019-09-09 at e0f6d18a10)

402 + + banned.h: fix vsprintf()'s ban message

403 +

404 + Error message fix.

405 +

406 +

407 +* tb/file-url-to-unc-path (2019-08-26) 1 commit

408 + (merged to 'next' on 2019-09-09 at 13d9c4000e)

409 + + mingw: support UNC in git clone file://server/share/repo

410 +

411 + Windows update.

412 +

413 +

414 +* tg/push-all-in-mirror-forbidden (2019-09-03) 1 commit

415 + (merged to 'next' on 2019-09-09 at 9db61400c8)

416 + + push: disallow --all and refspecs when remote.<name>.mirror is set

417 +

418 + Fix an earlier regression to "git push --all" which should have

419 + been forbidden when the target remote repository is set to be a

420 + mirror.

421

422 --------------------------------------------------

423 [Stalled]

424

425 +* cb/pcre2-chartables-leakfix (2019-08-06) 3 commits

426 + - grep: avoid leak of chartables in PCRE2

427 + - grep: make PCRE2 aware of custom allocator

428 + - grep: make PCRE1 aware of custom allocator

429 +

430 + WIP (this is v3 which is rather old, where the last message in the

431 + discussion talks about v6 that has never been sent to the list).

432 + cf. <CAPUEspjJNSrJQT7xV2fsdp2t5odW5fzzPdDxuar_5x_JPUtf6Q@mail.gmail.com>

433 +

434 +

435 * es/walken-tutorial (2019-08-07) 1 commit

436 - documentation: add tutorial for revision walking

437

@@ -194,7 +444,6 @@ of the repositories listed at

444

445 * dl/format-patch-cover-letter-subject (2019-09-05) 1 commit

446 - format-patch: learn --infer-cover-subject option

197 - (this branch uses dl/format-patch-doc-test-cleanup.)

447

448 "git format-patch --cover-letter" learned to optionally use the

449 first paragraph (typically a single-liner) of branch.*.description

@@ -203,20 +452,6 @@ of the repositories listed at

452 Reroll with a redesign with less emphasis on "subject" coming?

453

454

206 -* mt/threaded-grep-in-object-store (2019-08-13) 4 commits

207 - - grep: re-enable threads in some non-worktree cases

208 - - grep: disable grep_read_mutex when possible

209 - - grep: allow locks to be enabled individually

210 - - object-store: add lock to read_object_file_extended()

211 -

212 - Traditionally, we avoided threaded grep while searching in objects

213 - (as opposed to files in the working tree) as accesses to the object

214 - layer is not thread-safe. This limitation is getting lifted.

215 -

216 - Expecting a reroll.

217 - cf. <CAHd-oW4LZTFcoPvqd+FU03+64y7MzesMurCT7tUFQrF_z9ocnQ@mail.gmail.com>

218 -

219 -

455 * jn/unknown-index-extensions (2018-11-21) 2 commits

456 - index: offer advice for unknown index extensions

457 - index: do not warn about unrecognized extensions

@@ -276,667 +511,602 @@ of the repositories listed at

511 --------------------------------------------------

512 [Cooking]

513

279 -* bc/object-id-part17 (2019-08-19) 26 commits

280 - - midx: switch to using the_hash_algo

281 - - builtin/show-index: replace sha1_to_hex

282 - - rerere: replace sha1_to_hex

283 - - builtin/receive-pack: replace sha1_to_hex

284 - - builtin/index-pack: replace sha1_to_hex

285 - - packfile: replace sha1_to_hex

286 - - wt-status: convert struct wt_status to object_id

287 - - cache: remove null_sha1

288 - - builtin/worktree: switch null_sha1 to null_oid

289 - - builtin/repack: write object IDs of the proper length

290 - - pack-write: use hash_to_hex when writing checksums

291 - - sequencer: convert to use the_hash_algo

292 - - bisect: switch to using the_hash_algo

293 - - sha1-lookup: switch hard-coded constants to the_hash_algo

294 - - config: use the_hash_algo in abbrev comparison

295 - - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

296 - - bundle: switch to use the_hash_algo

297 - - connected: switch GIT_SHA1_HEXSZ to the_hash_algo

298 - - show-index: switch hard-coded constants to the_hash_algo

299 - - blame: remove needless comparison with GIT_SHA1_HEXSZ

300 - - builtin/rev-parse: switch to use the_hash_algo

301 - - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo

302 - - builtin/receive-pack: switch to use the_hash_algo

303 - - fetch-pack: use parse_oid_hex

304 - - patch-id: convert to use the_hash_algo

305 - - builtin/replace: make hash size independent

306 -

307 - Preparation for SHA-256 upgrade continues.

308 -

309 - Will merge to 'next'.

310 -

311 -

312 -* cb/skip-utf8-check-with-pcre1 (2019-09-09) 1 commit

313 - - grep: skip UTF8 checks explicitly

314 -

315 - Make sure the grep machinery does not abort when seeing a payload

316 - that is not UTF-8 even when JIT is not in use with PCRE1.

317 -

318 - Will merge to 'next'.

319 -

320 -

321 -* jk/commit-graph-cleanup (2019-09-09) 2 commits

322 - - commit-graph: turn off save_commit_buffer

323 - - commit-graph: don't show progress percentages while expanding reachable commits

324 -

325 - A pair of small fixups to "git commit-graph" have been applied.

326 -

327 - Will merge to 'next'.

328 -

329 -

330 -* ma/asciidoctor-more-fixes (2019-09-09) 7 commits

331 - - gitweb.conf.txt: switch pluses to backticks to help Asciidoctor

332 - - git-merge-index.txt: wrap shell listing in "----"

333 - - git-receive-pack.txt: wrap shell [script] listing in "----"

334 - - git-ls-remote.txt: wrap shell listing in "----"

335 - - Documentation: wrap config listings in "----"

336 - - git-merge-base.txt: render indentations correctly under Asciidoctor

337 - - Documentation: wrap blocks with "--"

338 -

339 - Doc formatting updates.

340 -

341 - Will merge to 'next'.

342 -

343 -

344 -* rs/simplify-by-deco-with-deco-refs-exclude (2019-09-09) 2 commits

345 - - log-tree: call load_ref_decorations() in get_name_decoration()

346 - - log: test --decorate-refs-exclude with --simplify-by-decoration

347 -

348 - "git log --decorate-refs-exclude=<pattern>" was incorrectly

349 - overruled when the "--simplify-by-decoration" option is used, which

350 - has been corrected.

351 -

352 - Will merge to 'next'.

353 -

354 -

355 -* ss/get-time-cleanup (2019-09-18) 2 commits

356 - - test_date.c: remove reference to GIT_TEST_DATE_NOW

357 - - Quit passing 'now' to date code

358 -

359 - Code simplification.

360 -

361 - Will merge to 'next'.

362 -

363 -

364 -* tb/commit-graph-harden (2019-09-09) 3 commits

365 - - commit-graph.c: handle corrupt/missing trees

366 - - commit-graph.c: handle commit parsing errors

367 - - t/t5318: introduce failing 'git commit-graph write' tests

368 -

369 - The code to parse and use the commit-graph file has been made more

370 - robust against corrupted input.

371 -

372 - Will merge to 'next'.

373 -

374 -

375 -* cs/pretty-formats-doc-typofix (2019-09-12) 1 commit

376 - - doc: minor formatting fix

377 -

378 - Doc fix.

514 +* mt/threaded-grep-in-object-store (2019-10-02) 11 commits

515 + - grep: move driver pre-load out of critical section

516 + - grep: re-enable threads in non-worktree case

517 + - grep: protect packed_git [re-]initialization

518 + - grep: allow submodule functions to run in parallel

519 + - submodule-config: add skip_if_read option to repo_read_gitmodules()

520 + - grep: replace grep_read_mutex by internal obj read lock

521 + - object-store: allow threaded access to object reading

522 + - replace-object: make replace operations thread-safe

523 + - grep: fix racy calls in grep_objects()

524 + - grep: fix race conditions at grep_submodule()

525 + - grep: fix race conditions on userdiff calls

526

380 - Will merge to 'next'.

381 -

382 -

383 -* dl/cocci-everywhere (2019-09-17) 4 commits

384 - - Makefile: run coccicheck on more source files

385 - - Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

386 - - Makefile: define THIRD_PARTY_SOURCES

387 - - Makefile: strip leading ./ in $(LIB_H)

388 - (this branch uses dl/compat-cleanup.)

389 -

390 - Coccinelle checks are done on more source files than before now.

391 -

392 - Will merge to 'next'.

393 -

394 -

395 -* dl/complete-rebase-and-archive (2019-09-12) 2 commits

396 - - completion: teach archive to use __gitcomp_builtin

397 - - completion: teach rebase to use __gitcomp_builtin

398 -

399 - The command line completion for "git archive" and "git rebase" are

400 - now made less prone to go out of sync with the binary.

401 -

402 - Will merge to 'next'.

403 -

404 -

405 -* gs/commit-graph-progress (2019-09-18) 1 commit

406 - - commit-graph: add --[no-]progress to write and verify

407 -

408 - Will merge to 'next'.

409 -

410 -

411 -* jk/disable-commit-graph-during-upload-pack (2019-09-12) 2 commits

412 - - upload-pack: disable commit graph more gently for shallow traversal

413 - - commit-graph: bump DIE_ON_LOAD check to actual load-time

414 -

415 - The "upload-pack" (the counterpart of "git fetch") needs to disable

416 - commit-graph when responding to a shallow clone/fetch request, but

417 - the way this was done made Git panic, which has been corrected.

418 -

419 - Will merge to 'next'.

420 -

421 -

422 -* jk/list-objects-optim-wo-trees (2019-09-12) 1 commit

423 - - list-objects: don't queue root trees unless revs->tree_objects is set

424 -

425 - The object traversal machinery has been optimized not to load tree

426 - objects when we are only interested in commit history.

427 -

428 - Will merge to 'next'.

527 + Traditionally, we avoided threaded grep while searching in objects

528 + (as opposed to files in the working tree) as accesses to the object

529 + layer is not thread-safe. This limitation is getting lifted.

530

531

431 -* mr/complete-more-for-log-etc (2019-09-12) 1 commit

432 - - completion: add missing completions for log, diff, show

532 +* jt/merge-recursive-symlink-is-not-a-dir-in-way (2019-09-20) 1 commit

533 + (merged to 'next' on 2019-09-30 at a5d6788e2e)

534 + + merge-recursive: symlink's descendants not in way

535

434 - Completion updates.

536 + A bug in merge-recursive code that triggers when a branch with a

537 + symbolic link is merged with a branch that replaces it with a

538 + directory has been fixed.

539

436 - Will merge to 'next'.

540 + Will merge to 'master'.

541

542

439 -* ah/doc-submodule-ignore-submodules (2019-09-18) 1 commit

440 - - doc: fix reference to --ignore-submodules

543 +* ps/my-first-contribution-alphasort (2019-09-28) 1 commit

544 + (merged to 'next' on 2019-09-30 at 729e6dc708)

545 + + doc: MyFirstContribution: fix cmd placement instructions

546

547 Docfix.

548

444 - Will merge to 'next'.

445 -

549 + Will merge to 'master'.

550

447 -* bc/doc-use-docbook-5 (2019-09-16) 1 commit

448 - - Documentation: fix build with Asciidoctor 2

551

450 - Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0

451 - no longer works with the older one.

552 +* rs/alias-use-copy-array (2019-09-20) 1 commit

553 + (merged to 'next' on 2019-09-30 at 4d90f4ba93)

554 + + git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

555

453 - Will merge to 'next'.

556 + Code cleanup.

557

558 + Will merge to 'master'.

559

456 -* cc/svn-fe-py-shebang (2019-09-18) 1 commit

457 - - contrib/svn-fe: fix shebang for svnrdump_sim.py

560

459 - Will merge to 'next'.

561 +* sg/t-helper-gitignore (2019-09-20) 1 commit

562 + (merged to 'next' on 2019-09-30 at 8e319a2eae)

563 + + t/helper: ignore only executable files

564

565 + Update the way build artifacts in t/helper/ directory are ignored.

566

462 -* dl/submodule-set-branch (2019-09-16) 1 commit

463 - - git-submodule.txt: fix AsciiDoc formatting error

567 + Will merge to 'master'.

568

465 - Docfix.

569

467 - Will merge to 'next'.

570 +* sg/travis-help-debug (2019-09-28) 1 commit

571 + (merged to 'next' on 2019-09-30 at 054a66bb75)

572 + + travis-ci: do not skip successfully tested trees in debug mode

573

574 + Dev support update.

575

470 -* en/clean-nested-with-ignored (2019-09-17) 12 commits

471 - - clean: fix theoretical path corruption

472 - - clean: rewrap overly long line

473 - - clean: avoid removing untracked files in a nested git repository

474 - - clean: disambiguate the definition of -d

475 - - git-clean.txt: do not claim we will delete files with -n/--dry-run

476 - - dir: add commentary explaining match_pathspec_item's return value

477 - - dir: if our pathspec might match files under a dir, recurse into it

478 - - dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case

479 - - dir: also check directories for matching pathspecs

480 - - dir: fix off-by-one error in match_pathspec_item

481 - - dir: fix typo in comment

482 - - t7300: add testcases showing failure to clean specified pathspecs

483 - (this branch uses sg/clean-nested-repo-with-ignored.)

576 + Will merge to 'master'.

577

485 - "git clean" fixes.

578

487 - Will merge to 'next'.

579 +* am/mailmap-andrey-mazo (2019-09-20) 1 commit

580 + (merged to 'next' on 2019-09-30 at 5e373b3cba)

581 + + .mailmap: update email address of Andrey Mazo

582

583 + Will merge to 'master'.

584

490 -* hb/hg-to-git-py3 (2019-09-18) 1 commit

491 - - hg-to-git: make it compatible with both python3 and python2

585

493 - The hg-to-git script (in contrib/) has been updated to work with

494 - Python 3.

586 +* am/t0028-utf16-tests (2019-09-28) 2 commits

587 + - t0028: add more tests

588 + - t0028: fix test for UTF-16-LE-BOM

589

496 - Will merge to 'next'.

590 + Test fixes.

591

592

499 -* jk/packfile-reuse-cleanup (2019-09-13) 10 commits

500 - - pack-objects: improve partial packfile reuse

501 - - builtin/pack-objects: introduce obj_is_packed()

502 - - pack-objects: introduce pack.allowPackReuse

503 - - csum-file: introduce hashfile_total()

504 - - pack-bitmap: introduce bitmap_walk_contains()

505 - - pack-bitmap: don't rely on bitmap_git->reuse_objects

506 - - ewah/bitmap: always allocate 2 more words

507 - - ewah/bitmap: introduce bitmap_word_alloc()

508 - - packfile: expose get_delta_base()

509 - - builtin/pack-objects: report reused packfile objects

593 +* am/visual-studio-config-fix (2019-09-28) 1 commit

594 + - contrib/buildsystems: fix Visual Studio Debug configuration

595

511 - The way "git pack-objects" reuses objects stored in existing pack

512 - to generate its result has been improved.

596 + Dev support.

597

598 Will merge to 'next'.

599

600

517 -* jk/partial-clone-sparse-blob (2019-09-16) 4 commits

518 - - list-objects-filter: use empty string instead of NULL for sparse "base"

519 - - list-objects-filter: give a more specific error sparse parsing error

520 - - list-objects-filter: delay parsing of sparse oid

521 - - t5616: test cloning/fetching with sparse:oid=<oid> filter

601 +* cb/do-not-use-test-cmp-with-a (2019-09-28) 1 commit

602 + (merged to 'next' on 2019-09-30 at 273ff0e62d)

603 + + t4038: Remove non-portable '-a' option passed to test_cmp

604

523 - The name of the blob object that stores the filter specification

524 - for sparse cloning/fetching was interpreted in a wrong place in the

525 - code, causing Git to abort.

605 + Test portability fix.

606

527 - Will merge to 'next'.

607 + Will merge to 'master'.

608

609

530 -* rs/commit-graph-use-list-count (2019-09-16) 1 commit

531 - - commit-graph: use commit_list_count()

610 +* cc/multi-promisor (2019-10-02) 2 commits

611 + (merged to 'next' on 2019-10-03 at a0a8ea56a9)

612 + + promisor-remote: skip move_to_tail when no-op

613 + (merged to 'next' on 2019-09-30 at c4826f5a08)

614 + + promisor-remote.h: drop extern from function declaration

615

533 - Code cleanup.

616 + Cleanup.

617

535 - Will merge to 'next'.

618 + Will merge to 'master'.

619

620

538 -* js/doc-patch-text (2019-09-17) 2 commits

539 - - diff, log doc: small grammer, format, and language fixes

540 - - diff, log doc: say "patch text" instead of "patches"

621 +* dl/honor-cflags-in-hdr-check (2019-10-03) 5 commits

622 + (merged to 'next' on 2019-10-03 at a346b79a78)

623 + + ci: run `hdr-check` as part of the `Static Analysis` job

624 + (merged to 'next' on 2019-09-30 at 708fb8988e)

625 + + Makefile: emulate compile in $(HCO) target better

626 + + pack-bitmap.h: remove magic number

627 + + promisor-remote.h: include missing header

628 + + apply.h: include missing header

629

542 - Docfix.

630 + Dev support.

631

544 - Will merge to 'next'.

632 + Will merge to 'master'.

633

634

547 -* ms/fetch-follow-tag-optim (2019-09-16) 1 commit

548 - - fetch: use oidset to keep the want OIDs for faster lookup

635 +* en/fast-imexport-nested-tags (2019-10-02) 8 commits

636 + - fast-export: handle nested tags

637 + - t9350: add tests for tags of things other than a commit

638 + - fast-export: allow user to request tags be marked with --mark-tags

639 + - fast-export: add support for --import-marks-if-exists

640 + - fast-import: add support for new 'alias' command

641 + - fast-import: allow tags to be identified by mark labels

642 + - fast-import: fix handling of deleted tags

643 + - fast-export: fix exporting a tag and nothing else

644

550 - The code used in following tags in "git fetch" has been optimized.

645 + Updates to fast-import/export.

646

647 Will merge to 'next'.

648

649

555 -* rs/nth-parent-parse (2019-09-16) 2 commits

556 - - sha1-name: check for overflow of N in "foo^N" and "foo~N"

557 - - rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"

650 +* js/diff-rename-force-stable-sort (2019-10-02) 2 commits

651 + - diffcore_rename(): use a stable sort

652 + - Move git_sort(), a stable sort, into into libgit.a

653

559 - The object name parser for "Nth parent" syntax has been made more

560 - robust against integer overflows.

654 + The rename detection logic sorts a list of rename source candidates

655 + by similarity to pick the best candidate, which means that a tie

656 + between sources with the same similarity is broken by the original

657 + location in the original canidate list (which is sorted by path).

658 + Force the sorting by similarity done with a stable sort, which is

659 + not promised by system supplied qsort(3), to ensure consistent

660 + results across platforms.

661

662 Will merge to 'next'.

663

664

565 -* rs/nth-switch-code-simplification (2019-09-18) 1 commit

566 - - sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()

665 +* ma/user-manual-markup-update (2019-09-28) 4 commits

666 + (merged to 'next' on 2019-09-30 at 822fa2ed99)

667 + + user-manual.txt: render ASCII art correctly under Asciidoctor

668 + + asciidoctor-extensions.rb: handle "book" doctype in linkgit

669 + + user-manual.txt: change header notation

670 + + user-manual.txt: add missing section label

671

568 - Code simplification.

672 + The markup used in user-manual has been updated to work better with

673 + asciidoctor.

674

570 - Will merge to 'next'.

675 + Will merge to 'master'.

676

677

573 -* sg/progress-fix (2019-09-17) 2 commits

574 - - Test the progress display

575 - - Revert "progress: use term_clear_line()"

678 +* sg/name-rev-cutoff-underflow-fix (2019-09-28) 1 commit

679 + - name-rev: avoid cutoff timestamp underflow

680

577 - Regression fix for progress output.

681 + Integer arith fix.

682

683 Will merge to 'next'.

684

685

582 -* jc/git-gui-has-maintainer (2019-09-18) 1 commit

583 - - SubmittingPatches: git-gui has a new maintainer

686 +* tk/git-svn-trim-author-name (2019-09-28) 1 commit

687 + - git-svn: trim leading and trailing whitespaces in author name

688 +

689 + The author names taken from SVN repositories may have extra leading

690 + or trailing whitespaces, which are now munged away.

691

692 Will merge to 'next'.

693

694

588 -* ar/mingw-run-external-with-non-ascii-path (2019-08-26) 1 commit

589 - (merged to 'next' on 2019-09-09 at 1973826628)

590 - + mingw: fix launching of externals from Unicode paths

695 +* bw/submodule-helper-usage-fix (2019-09-29) 1 commit

696 + (merged to 'next' on 2019-09-30 at 78d2f28ef7)

697 + + builtin/submodule--helper: fix usage string for 'update-clone'

698

592 - Windows update.

699 + Typofix.

700

701 Will merge to 'master'.

702

703

597 -* cb/pcre1-cleanup (2019-08-26) 2 commits

598 - - grep: refactor and simplify PCRE1 support

599 - - grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1

600 - (this branch uses ab/pcre-jit-fixes.)

704 +* bc/object-id-part17 (2019-08-19) 26 commits

705 + - midx: switch to using the_hash_algo

706 + - builtin/show-index: replace sha1_to_hex

707 + - rerere: replace sha1_to_hex

708 + - builtin/receive-pack: replace sha1_to_hex

709 + - builtin/index-pack: replace sha1_to_hex

710 + - packfile: replace sha1_to_hex

711 + - wt-status: convert struct wt_status to object_id

712 + - cache: remove null_sha1

713 + - builtin/worktree: switch null_sha1 to null_oid

714 + - builtin/repack: write object IDs of the proper length

715 + - pack-write: use hash_to_hex when writing checksums

716 + - sequencer: convert to use the_hash_algo

717 + - bisect: switch to using the_hash_algo

718 + - sha1-lookup: switch hard-coded constants to the_hash_algo

719 + - config: use the_hash_algo in abbrev comparison

720 + - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

721 + - bundle: switch to use the_hash_algo

722 + - connected: switch GIT_SHA1_HEXSZ to the_hash_algo

723 + - show-index: switch hard-coded constants to the_hash_algo

724 + - blame: remove needless comparison with GIT_SHA1_HEXSZ

725 + - builtin/rev-parse: switch to use the_hash_algo

726 + - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo

727 + - builtin/receive-pack: switch to use the_hash_algo

728 + - fetch-pack: use parse_oid_hex

729 + - patch-id: convert to use the_hash_algo

730 + - builtin/replace: make hash size independent

731

602 - PCRE fixes.

732 + Preparation for SHA-256 upgrade continues.

733

604 - Will merge to 'next'?

734 + Will merge to 'next'.

735

736

607 -* dl/complete-cherry-pick-revert-skip (2019-08-27) 3 commits

608 - (merged to 'next' on 2019-09-18 at 7dd173f824)

609 - + status: mention --skip for revert and cherry-pick

610 - + completion: add --skip for cherry-pick and revert

611 - + completion: merge options for cherry-pick and revert

737 +* cb/skip-utf8-check-with-pcre1 (2019-09-09) 1 commit

738 + (merged to 'next' on 2019-09-30 at f6113b33cf)

739 + + grep: skip UTF8 checks explicitly

740

613 - The command line completion support (in contrib/) learned about the

614 - "--skip" option of "git revert" and "git cherry-pick".

741 + Make sure the grep machinery does not abort when seeing a payload

742 + that is not UTF-8 even when JIT is not in use with PCRE1.

743

744 Will merge to 'master'.

745

746

619 -* ew/hashmap (2019-09-28) 19 commits

620 - - hashmap: remove type arg from hashmap_{get,put,remove}_entry

621 - - OFFSETOF_VAR macro to simplify hashmap iterators

622 - - hashmap: introduce hashmap_free_entries

623 - - hashmap: hashmap_{put,remove} return hashmap_entry *

624 - - hashmap: use *_entry APIs for iteration

625 - - hashmap_cmp_fn takes hashmap_entry params

626 - - hashmap_get{,_from_hash} return "struct hashmap_entry *"

627 - - hashmap: use *_entry APIs to wrap container_of

628 - - hashmap_get_next returns "struct hashmap_entry *"

629 - - introduce container_of macro

630 - - hashmap_put takes "struct hashmap_entry *"

631 - - hashmap_remove takes "const struct hashmap_entry *"

632 - - hashmap_get takes "const struct hashmap_entry *"

633 - - hashmap_add takes "struct hashmap_entry *"

634 - - hashmap_get_next takes "const struct hashmap_entry *"

635 - - hashmap_entry_init takes "struct hashmap_entry *"

636 - - packfile: use hashmap_entry in delta_base_cache_entry

637 - - coccicheck: detect hashmap_entry.hash assignment

638 - - diff: use hashmap_entry_init on moved_entry.ent

747 +* jk/commit-graph-cleanup (2019-09-09) 2 commits

748 + (merged to 'next' on 2019-09-30 at f78e24d14b)

749 + + commit-graph: turn off save_commit_buffer

750 + + commit-graph: don't show progress percentages while expanding reachable commits

751

640 - Code clean-up of the hashmap API, both users and implementation.

752 + A pair of small fixups to "git commit-graph" have been applied.

753

642 - clang seems to be unhappy, even though gcc seems to be fine.

643 - cf. <xmqqy2y7ihih.fsf@gitster-ct.c.googlers.com>

754 + Will merge to 'master'.

755

756

646 -* jk/fast-import-history-bugfix (2019-08-27) 2 commits

647 - (merged to 'next' on 2019-09-09 at eeef864077)

648 - + fast-import: duplicate into history rather than passing ownership

649 - + fast-import: duplicate parsed encoding string

757 +* ma/asciidoctor-more-fixes (2019-09-09) 7 commits

758 + (merged to 'next' on 2019-09-30 at 4937cac46f)

759 + + gitweb.conf.txt: switch pluses to backticks to help Asciidoctor

760 + + git-merge-index.txt: wrap shell listing in "----"

761 + + git-receive-pack.txt: wrap shell [script] listing in "----"

762 + + git-ls-remote.txt: wrap shell listing in "----"

763 + + Documentation: wrap config listings in "----"

764 + + git-merge-base.txt: render indentations correctly under Asciidoctor

765 + + Documentation: wrap blocks with "--"

766

651 - The memory ownership model of the "git fast-import" got

652 - straightened out.

767 + Doc formatting updates.

768

769 Will merge to 'master'.

770

771

657 -* js/gitdir-at-unc-root (2019-08-26) 3 commits

658 - (merged to 'next' on 2019-09-09 at 70ccc59b4b)

659 - + setup_git_directory(): handle UNC root paths correctly

660 - + Fix .git/ discovery at the root of UNC shares

661 - + setup_git_directory(): handle UNC paths correctly

772 +* rs/simplify-by-deco-with-deco-refs-exclude (2019-09-09) 2 commits

773 + (merged to 'next' on 2019-09-30 at 3c155bbd24)

774 + + log-tree: call load_ref_decorations() in get_name_decoration()

775 + + log: test --decorate-refs-exclude with --simplify-by-decoration

776

663 - On Windows, the root level of UNC share is now allowed to be used

664 - just like any other directory.

777 + "git log --decorate-refs-exclude=<pattern>" was incorrectly

778 + overruled when the "--simplify-by-decoration" option is used, which

779 + has been corrected.

780

781 Will merge to 'master'.

782

783

669 -* mh/http-urlmatch-cleanup (2019-08-26) 1 commit

670 - (merged to 'next' on 2019-09-09 at 9971b626f1)

671 - + http: don't leak urlmatch_config.vars

784 +* ss/get-time-cleanup (2019-09-18) 2 commits

785 + (merged to 'next' on 2019-09-30 at 21a0dced8f)

786 + + test_date.c: remove reference to GIT_TEST_DATE_NOW

787 + + Quit passing 'now' to date code

788

673 - Leakfix.

789 + Code simplification.

790

791 Will merge to 'master'.

792

793

678 -* mh/notes-duplicate-entries (2019-08-26) 2 commits

679 - (merged to 'next' on 2019-09-09 at 6c44967c97)

680 - + notes: avoid potential use-after-free during insertion

681 - + notes: avoid leaking duplicate entries

794 +* tb/commit-graph-harden (2019-09-09) 3 commits

795 + (merged to 'next' on 2019-09-30 at b9350a562d)

796 + + commit-graph.c: handle corrupt/missing trees

797 + + commit-graph.c: handle commit parsing errors

798 + + t/t5318: introduce failing 'git commit-graph write' tests

799

683 - A few implementation fixes in the notes API.

800 + The code to parse and use the commit-graph file has been made more

801 + robust against corrupted input.

802

803 Will merge to 'master'.

804

805

688 -* mh/release-commit-memory-fix (2019-08-26) 1 commit

689 - (merged to 'next' on 2019-09-09 at 9fb7485032)

690 - + commit: free the right buffer in release_commit_memory

806 +* cs/pretty-formats-doc-typofix (2019-09-12) 1 commit

807 + (merged to 'next' on 2019-09-30 at a29a425208)

808 + + doc: minor formatting fix

809

692 - Leakfix.

810 + Doc fix.

811

812 Will merge to 'master'.

813

814

697 -* rs/strbuf-detach (2019-08-26) 2 commits

698 - (merged to 'next' on 2019-09-09 at f6bba7d52f)

699 - + grep: use return value of strbuf_detach()

700 - + log-tree: always use return value of strbuf_detach()

815 +* dl/cocci-everywhere (2019-09-17) 4 commits

816 + (merged to 'next' on 2019-09-30 at 1bb1c0846f)

817 + + Makefile: run coccicheck on more source files

818 + + Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

819 + + Makefile: define THIRD_PARTY_SOURCES

820 + + Makefile: strip leading ./ in $(LIB_H)

821

702 - Straighten out the use of strbuf_detach() API function.

822 + Coccinelle checks are done on more source files than before now.

823

824 Will merge to 'master'.

825

826

707 -* rs/trace2-dst-warning (2019-08-26) 1 commit

708 - (merged to 'next' on 2019-09-09 at 13893cdf8c)

709 - + trace2: use warning() directly in tr2_dst_malformed_warning()

827 +* dl/complete-rebase-and-archive (2019-09-12) 2 commits

828 + (merged to 'next' on 2019-09-30 at ddeb81ff41)

829 + + completion: teach archive to use __gitcomp_builtin

830 + + completion: teach rebase to use __gitcomp_builtin

831

711 - Code cleanup.

832 + The command line completion for "git archive" and "git rebase" are

833 + now made less prone to go out of sync with the binary.

834

835 Will merge to 'master'.

836

837

716 -* sg/clean-nested-repo-with-ignored (2019-08-26) 1 commit

717 - (merged to 'next' on 2019-09-18 at 0da1269f07)

718 - + t7300-clean: demonstrate deleting nested repo with an ignored file breakage

719 - (this branch is used by en/clean-nested-with-ignored.)

720 -

721 - A bug documentation.

838 +* gs/commit-graph-progress (2019-09-18) 1 commit

839 + (merged to 'next' on 2019-09-30 at 7c03eac969)

840 + + commit-graph: add --[no-]progress to write and verify

841

842 Will merge to 'master'.

843

844

726 -* tb/banned-vsprintf-namefix (2019-08-26) 1 commit

727 - (merged to 'next' on 2019-09-09 at e0f6d18a10)

728 - + banned.h: fix vsprintf()'s ban message

845 +* jk/disable-commit-graph-during-upload-pack (2019-09-12) 2 commits

846 + (merged to 'next' on 2019-09-30 at 87dae76fb7)

847 + + upload-pack: disable commit graph more gently for shallow traversal

848 + + commit-graph: bump DIE_ON_LOAD check to actual load-time

849

730 - Error message fix.

850 + The "upload-pack" (the counterpart of "git fetch") needs to disable

851 + commit-graph when responding to a shallow clone/fetch request, but

852 + the way this was done made Git panic, which has been corrected.

853

854 Will merge to 'master'.

855

856

735 -* tb/file-url-to-unc-path (2019-08-26) 1 commit

736 - (merged to 'next' on 2019-09-09 at 13d9c4000e)

737 - + mingw: support UNC in git clone file://server/share/repo

857 +* jk/list-objects-optim-wo-trees (2019-09-12) 1 commit

858 + (merged to 'next' on 2019-09-30 at 9ef098d07f)

859 + + list-objects: don't queue root trees unless revs->tree_objects is set

860

739 - Windows update.

861 + The object traversal machinery has been optimized not to load tree

862 + objects when we are only interested in commit history.

863

864 Will merge to 'master'.

865

866

744 -* dl/compat-cleanup (2019-09-05) 2 commits

745 - (merged to 'next' on 2019-09-09 at e33c896e16)

746 - + compat/*.[ch]: remove extern from function declarations using spatch

747 - + mingw: apply array.cocci rule

748 - (this branch is used by dl/cocci-everywhere.)

867 +* mr/complete-more-for-log-etc (2019-09-12) 1 commit

868 + (merged to 'next' on 2019-09-30 at b2507b21cb)

869 + + completion: add missing completions for log, diff, show

870

750 - Code cleanup.

871 + Completion updates.

872

873 Will merge to 'master'.

874

875

755 -* dl/use-sq-from-test-lib (2019-09-06) 1 commit

756 - (merged to 'next' on 2019-09-09 at 9a6619ddab)

757 - + t: use common $SQ variable

876 +* ah/doc-submodule-ignore-submodules (2019-09-18) 1 commit

877 + (merged to 'next' on 2019-09-30 at 9eb3de8d1b)

878 + + doc: fix reference to --ignore-submodules

879

759 - Code cleanup.

880 + Docfix.

881

882 Will merge to 'master'.

883

884

764 -* ds/commit-graph-on-fetch (2019-09-03) 1 commit

765 - (merged to 'next' on 2019-09-18 at 10702dd989)

766 - + fetch: add fetch.writeCommitGraph config setting

885 +* bc/doc-use-docbook-5 (2019-09-16) 1 commit

886 + (merged to 'next' on 2019-09-30 at 31c4cf70ae)

887 + + Documentation: fix build with Asciidoctor 2

888

768 - A configuration variable tells "git fetch" to write the commit

769 - graph after finishing.

889 + Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0

890 + no longer works with the older one.

891 +

892 + Will merge to 'master'.

893 +

894 +

895 +* cc/svn-fe-py-shebang (2019-09-18) 1 commit

896 + (merged to 'next' on 2019-09-30 at 27c8457202)

897 + + contrib/svn-fe: fix shebang for svnrdump_sim.py

898

899 Will merge to 'master'.

900

901

774 -* ds/include-exclude (2019-09-05) 5 commits

775 - (merged to 'next' on 2019-09-18 at 1a3655a089)

776 - + unpack-trees: rename 'is_excluded_from_list()'

777 - + treewide: rename 'exclude' methods to 'pattern'

778 - + treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'

779 - + treewide: rename 'struct exclude_list' to 'struct pattern_list'

780 - + treewide: rename 'struct exclude' to 'struct path_pattern'

902 +* dl/submodule-set-branch (2019-09-16) 1 commit

903 + (merged to 'next' on 2019-09-30 at c66b398cc1)

904 + + git-submodule.txt: fix AsciiDoc formatting error

905

782 - The internal code originally invented for ".gitignore" processing

783 - got reshuffled and renamed to make it less tied to "excluding" and

784 - stress more that it is about "matching", as it has been reused for

785 - things like sparse checkout specification that want to check if a

786 - path is "included".

906 + Docfix.

907

908 Will merge to 'master'.

909

910

791 -* dt/remote-helper-doc-re-lock-option (2019-08-30) 1 commit

792 - (merged to 'next' on 2019-09-09 at 970488992a)

793 - + clarify documentation for remote helpers

911 +* en/clean-nested-with-ignored (2019-10-02) 13 commits

912 + (merged to 'next' on 2019-10-03 at 969ec06cc7)

913 + + dir: special case check for the possibility that pathspec is NULL

914 + (merged to 'next' on 2019-09-30 at 778cc31eac)

915 + + clean: fix theoretical path corruption

916 + + clean: rewrap overly long line

917 + + clean: avoid removing untracked files in a nested git repository

918 + + clean: disambiguate the definition of -d

919 + + git-clean.txt: do not claim we will delete files with -n/--dry-run

920 + + dir: add commentary explaining match_pathspec_item's return value

921 + + dir: if our pathspec might match files under a dir, recurse into it

922 + + dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case

923 + + dir: also check directories for matching pathspecs

924 + + dir: fix off-by-one error in match_pathspec_item

925 + + dir: fix typo in comment

926 + + t7300: add testcases showing failure to clean specified pathspecs

927

795 - Doc update.

928 + "git clean" fixes.

929

930 Will merge to 'master'.

931

932

800 -* en/filter-branch-deprecation (2019-09-05) 3 commits

801 - (merged to 'next' on 2019-09-09 at 311ed09ba8)

802 - + t9902: use a non-deprecated command for testing

803 - + Recommend git-filter-repo instead of git-filter-branch

804 - + t6006: simplify, fix, and optimize empty message test

933 +* hb/hg-to-git-py3 (2019-09-18) 1 commit

934 + (merged to 'next' on 2019-09-30 at 28f7e9bae3)

935 + + hg-to-git: make it compatible with both python3 and python2

936

806 - Start discouraging the use of "git filter-branch".

937 + The hg-to-git script (in contrib/) has been updated to work with

938 + Python 3.

939

940 Will merge to 'master'.

941

942

811 -* en/merge-options-ff-and-friends (2019-09-01) 1 commit

812 - (merged to 'next' on 2019-09-09 at b3bcc2cbc7)

813 - + merge-options.txt: clarify meaning of various ff-related options

943 +* jk/packfile-reuse-cleanup (2019-09-13) 10 commits

944 + (merged to 'next' on 2019-09-30 at dc60b31833)

945 + + pack-objects: improve partial packfile reuse

946 + + builtin/pack-objects: introduce obj_is_packed()

947 + + pack-objects: introduce pack.allowPackReuse

948 + + csum-file: introduce hashfile_total()

949 + + pack-bitmap: introduce bitmap_walk_contains()

950 + + pack-bitmap: don't rely on bitmap_git->reuse_objects

951 + + ewah/bitmap: always allocate 2 more words

952 + + ewah/bitmap: introduce bitmap_word_alloc()

953 + + packfile: expose get_delta_base()

954 + + builtin/pack-objects: report reused packfile objects

955

815 - Doc update.

956 + The way "git pack-objects" reuses objects stored in existing pack

957 + to generate its result has been improved.

958 +

959 + On hold until we give it a more thorough review.

960 + cf. <20191002155721.GD6116@sigill.intra.peff.net>

961 +

962 +

963 +* jk/partial-clone-sparse-blob (2019-09-16) 4 commits

964 + (merged to 'next' on 2019-09-30 at 44b33488ea)

965 + + list-objects-filter: use empty string instead of NULL for sparse "base"

966 + + list-objects-filter: give a more specific error sparse parsing error

967 + + list-objects-filter: delay parsing of sparse oid

968 + + t5616: test cloning/fetching with sparse:oid=<oid> filter

969 +

970 + The name of the blob object that stores the filter specification

971 + for sparse cloning/fetching was interpreted in a wrong place in the

972 + code, causing Git to abort.

973

974 Will merge to 'master'.

975

976

820 -* jc/test-cleanup (2019-09-05) 2 commits

821 - (merged to 'next' on 2019-09-09 at 41ced23598)

822 - + t3005: remove unused variable

823 - + t: use LF variable defined in the test harness

977 +* rs/commit-graph-use-list-count (2019-09-16) 1 commit

978 + (merged to 'next' on 2019-09-30 at 8986e5537f)

979 + + commit-graph: use commit_list_count()

980

981 Code cleanup.

982

983 Will merge to 'master'.

984

985

830 -* jk/misc-uninitialized-fixes (2019-09-06) 6 commits

831 - (merged to 'next' on 2019-09-09 at 39ccd21475)

832 - + pack-objects: drop packlist index_pos optimization

833 - + test-read-cache: drop namelen variable

834 - + diff-delta: set size out-parameter to 0 for NULL delta

835 - + bulk-checkin: zero-initialize hashfile_checkpoint

836 - + pack-objects: use object_id in packlist_alloc()

837 - + git-am: handle missing "author" when parsing commit

986 +* js/doc-patch-text (2019-09-17) 2 commits

987 + (merged to 'next' on 2019-09-30 at f9b391a66b)

988 + + diff, log doc: small grammer, format, and language fixes

989 + + diff, log doc: say "patch text" instead of "patches"

990

839 - Various fixes to codepaths gcc 9 had trouble following dataflow.

991 + Docfix.

992

993 Will merge to 'master'.

994

995

844 -* js/visual-studio (2019-09-05) 1 commit

845 - (merged to 'next' on 2019-09-09 at 5493ee9474)

846 - + .gitignore: stop ignoring `.manifest` files

996 +* ms/fetch-follow-tag-optim (2019-09-16) 1 commit

997 + (merged to 'next' on 2019-09-30 at 97ec83d2a2)

998 + + fetch: use oidset to keep the want OIDs for faster lookup

999

848 - Adjust .gitignore to unignore a path that we started to track.

1000 + The code used in following tags in "git fetch" has been optimized.

1001

1002 Will merge to 'master'.

1003

1004

853 -* jt/cache-tree-avoid-lazy-fetch-during-merge (2019-09-09) 1 commit

854 - - cache-tree: do not lazy-fetch tentative tree

1005 +* rs/nth-parent-parse (2019-09-16) 2 commits

1006 + (merged to 'next' on 2019-09-30 at 5bdfeacdff)

1007 + + sha1-name: check for overflow of N in "foo^N" and "foo~N"

1008 + + rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"

1009

856 - The cache-tree code has been taught to be less aggressive in

857 - attempting to see if a tree object it computed already exists in

858 - the repository.

1010 + The object name parser for "Nth parent" syntax has been made more

1011 + robust against integer overflows.

1012

860 - Will merge to 'next'.

1013 + Will merge to 'master'.

1014

1015

863 -* ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits

864 - - doc-diff: replace --cut-header-footer with --cut-footer

865 - - asciidoctor-extensions: provide `<refmiscinfo/>`

866 - - Doc/Makefile: give mansource/-version/-manual attributes

1016 +* rs/nth-switch-code-simplification (2019-09-18) 1 commit

1017 + (merged to 'next' on 2019-09-30 at 4233f54a72)

1018 + + sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()

1019

868 - Update support for Asciidoctor documentation toolchain.

1020 + Code simplification.

1021

870 - Will merge to 'next'.

1022 + Will merge to 'master'.

1023

1024

873 -* nd/switch-and-restore (2019-08-30) 1 commit

874 - (merged to 'next' on 2019-09-09 at 97e7e06801)

875 - + checkout: add simple check for 'git checkout -b'

1025 +* sg/progress-fix (2019-09-17) 2 commits

1026 + (merged to 'next' on 2019-09-30 at d352332810)

1027 + + Test the progress display

1028 + + Revert "progress: use term_clear_line()"

1029

877 - Resurrect a performance hack.

1030 + Regression fix for progress output.

1031

1032 Will merge to 'master'.

1033

1034

882 -* rs/get-tagged-oid (2019-09-05) 2 commits

883 - (merged to 'next' on 2019-09-09 at 0e9489a835)

884 - + use get_tagged_oid()

885 - + tag: factor out get_tagged_oid()

886 -

887 - Code cleanup.

1035 +* jc/git-gui-has-maintainer (2019-09-18) 1 commit

1036 + (merged to 'next' on 2019-09-30 at dfe61e947c)

1037 + + SubmittingPatches: git-gui has a new maintainer

1038

1039 Will merge to 'master'.

1040

1041

892 -* rs/help-unknown-ref-does-not-return (2019-08-30) 1 commit

893 - (merged to 'next' on 2019-09-09 at 4b00ea1ac9)

894 - + help: make help_unknown_ref() NORETURN

1042 +* cb/pcre1-cleanup (2019-08-26) 2 commits

1043 + - grep: refactor and simplify PCRE1 support

1044 + - grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1

1045 + (this branch uses ab/pcre-jit-fixes.)

1046

896 - Code cleanup.

1047 + PCRE fixes.

1048

898 - Will merge to 'master'.

1049 + Will merge to 'next'.

1050

1051

901 -* rs/parse-tree-indirect (2019-09-03) 1 commit

902 - (merged to 'next' on 2019-09-09 at 157e836dba)

903 - + tree: simplify parse_tree_indirect()

1052 +* ew/hashmap (2019-09-28) 19 commits

1053 + - hashmap: remove type arg from hashmap_{get,put,remove}_entry

1054 + - OFFSETOF_VAR macro to simplify hashmap iterators

1055 + - hashmap: introduce hashmap_free_entries

1056 + - hashmap: hashmap_{put,remove} return hashmap_entry *

1057 + - hashmap: use *_entry APIs for iteration

1058 + - hashmap_cmp_fn takes hashmap_entry params

1059 + - hashmap_get{,_from_hash} return "struct hashmap_entry *"

1060 + - hashmap: use *_entry APIs to wrap container_of

1061 + - hashmap_get_next returns "struct hashmap_entry *"

1062 + - introduce container_of macro

1063 + - hashmap_put takes "struct hashmap_entry *"

1064 + - hashmap_remove takes "const struct hashmap_entry *"

1065 + - hashmap_get takes "const struct hashmap_entry *"

1066 + - hashmap_add takes "struct hashmap_entry *"

1067 + - hashmap_get_next takes "const struct hashmap_entry *"

1068 + - hashmap_entry_init takes "struct hashmap_entry *"

1069 + - packfile: use hashmap_entry in delta_base_cache_entry

1070 + - coccicheck: detect hashmap_entry.hash assignment

1071 + - diff: use hashmap_entry_init on moved_entry.ent

1072

905 - Code cleanup.

1073 + Code clean-up of the hashmap API, both users and implementation.

1074

907 - Will merge to 'master'.

1075 + clang seems to be unhappy, even though gcc seems to be fine.

1076 + cf. <xmqqy2y7ihih.fsf@gitster-ct.c.googlers.com>

1077

1078

910 -* sg/git-test-boolean (2019-09-06) 2 commits

911 - (merged to 'next' on 2019-09-09 at 90406d6375)

912 - + ci: restore running httpd tests

913 - + t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests

1079 +* jt/cache-tree-avoid-lazy-fetch-during-merge (2019-09-09) 1 commit

1080 + (merged to 'next' on 2019-09-30 at 5d8ffc2e0f)

1081 + + cache-tree: do not lazy-fetch tentative tree

1082

915 - Fix an earlier regression in the test suite, which mistakenly

916 - stopped running HTTPD tests.

1083 + The cache-tree code has been taught to be less aggressive in

1084 + attempting to see if a tree object it computed already exists in

1085 + the repository.

1086

1087 Will merge to 'master'.

1088

1089

921 -* tg/push-all-in-mirror-forbidden (2019-09-03) 1 commit

922 - (merged to 'next' on 2019-09-09 at 9db61400c8)

923 - + push: disallow --all and refspecs when remote.<name>.mirror is set

1090 +* ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits

1091 + (merged to 'next' on 2019-09-30 at e5d13aceb8)

1092 + + doc-diff: replace --cut-header-footer with --cut-footer

1093 + + asciidoctor-extensions: provide `<refmiscinfo/>`

1094 + + Doc/Makefile: give mansource/-version/-manual attributes

1095

925 - Fix an earlier regression to "git push --all" which should have

926 - been forbidden when the target remote repository is set to be a

927 - mirror.

1096 + Update support for Asciidoctor documentation toolchain.

1097

1098 Will merge to 'master'.

1099

1100

1101 * tg/stash-refresh-index (2019-09-20) 3 commits

933 - - stash: make sure to write refreshed cache

934 - - merge: use refresh_and_write_cache

935 - - factor out refresh_and_write_cache function

1102 + (merged to 'next' on 2019-09-30 at de7759ad1d)

1103 + + stash: make sure to write refreshed cache

1104 + + merge: use refresh_and_write_cache

1105 + + factor out refresh_and_write_cache function

1106

1107 "git stash" learned to write refreshed index back to disk.

1108

939 - Will merge to 'next'.

1109 + Will merge to 'master'.

1110

1111

1112 * js/builtin-add-i (2019-08-30) 11 commits

@@ -957,7 +1127,9 @@ of the repositories listed at

1127 On hold, waiting for tg/stash-refresh-index to work well with this.

1128

1129

960 -* en/merge-recursive-cleanup (2019-08-19) 24 commits

1130 +* en/merge-recursive-cleanup (2019-10-02) 25 commits

1131 + (merged to 'next' on 2019-10-03 at 7b5a32726b)

1132 + + merge-recursive: fix the diff3 common ancestor label for virtual commits

1133 (merged to 'next' on 2019-09-18 at f52cb08a14)

1134 + merge-recursive: alphabetize include list

1135 + merge-recursive: add sanity checks for relevant merge_options

@@ -991,63 +1163,6 @@ of the repositories listed at

1163 Will merge to 'master'.

1164

1165

994 -* bc/hash-independent-tests-part-5 (2019-08-26) 14 commits

995 - (merged to 'next' on 2019-09-09 at 49defc07af)

996 - + t4009: make hash size independent

997 - + t4002: make hash independent

998 - + t4000: make hash size independent

999 - + t3903: abstract away SHA-1-specific constants

1000 - + t3800: make hash-size independent

1001 - + t3600: make hash size independent

1002 - + t3506: make hash independent

1003 - + t3430: avoid hard-coded object IDs

1004 - + t3404: abstract away SHA-1-specific constants

1005 - + t3306: abstract away SHA-1-specific constants

1006 - + t3305: make hash size independent

1007 - + t3301: abstract away SHA-1-specific constants

1008 - + t3206: abstract away hash size constants

1009 - + t3201: abstract away SHA-1-specific constants

1010 -

1011 - Preparation for SHA-256 upgrade continues in the test department.

1012 -

1013 - Will merge to 'master'.

1014 -

1015 -

1016 -* bw/rebase-autostash-keep-current-branch (2019-09-07) 2 commits

1017 - (merged to 'next' on 2019-09-18 at 6d8ed846ed)

1018 - + builtin/rebase.c: Remove pointless message

1019 - + builtin/rebase.c: make sure the active branch isn't moved when autostashing

1020 -

1021 - "git rebase --autostash <upstream> <branch>", when <branch> is

1022 - different from the current branch, incorrectly moved the tip of the

1023 - current branch, which has been corrected.

1024 -

1025 - Will merge to 'master'.

1026 -

1027 -

1028 -* dl/format-patch-doc-test-cleanup (2019-09-05) 13 commits

1029 - (merged to 'next' on 2019-09-09 at b3022b4002)

1030 - + config/format.txt: specify default value of format.coverLetter

1031 - + Doc: add more detail for git-format-patch

1032 - + t4014: stop losing return codes of git commands

1033 - + t4014: remove confusing pipe in check_threading()

1034 - + t4014: use test_line_count() where possible

1035 - + t4014: let sed open its own files

1036 - + t4014: drop redirections to /dev/null

1037 - + t4014: use indentable here-docs

1038 - + t4014: remove spaces after redirect operators

1039 - + t4014: use sq for test case names

1040 - + t4014: move closing sq onto its own line

1041 - + t4014: s/expected/expect/

1042 - + t4014: drop unnecessary blank lines from test cases

1043 - (this branch is used by dl/format-patch-cover-letter-subject.)

1044 -

1045 - The documentation and tests for "git format-patch" have been

1046 - cleaned up.

1047 -

1048 - Will merge to 'master'.

1049 -

1050 -

1166 * pw/rebase-i-show-HEAD-to-reword (2019-08-19) 3 commits

1167 - sequencer: simplify root commit creation

1168 - rebase -i: check for updated todo after squash and reword

@@ -1059,29 +1174,6 @@ of the repositories listed at

1174 Will merge to 'next'.

1175

1176

1062 -* cb/pcre2-chartables-leakfix (2019-08-06) 3 commits

1063 - - grep: avoid leak of chartables in PCRE2

1064 - - grep: make PCRE2 aware of custom allocator

1065 - - grep: make PCRE1 aware of custom allocator

1066 -

1067 - WIP.

1068 -

1069 -

1070 -* jh/trace2-pretty-output (2019-08-09) 7 commits

1071 - (merged to 'next' on 2019-09-18 at 503974aa46)

1072 - + trace2: cleanup whitespace in perf format

1073 - + trace2: cleanup whitespace in normal format

1074 - + quote: add sq_append_quote_argv_pretty()

1075 - + trace2: trim trailing whitespace in normal format error message

1076 - + trace2: remove dead code in maybe_add_string_va()

1077 - + trace2: trim whitespace in region messages in perf target format

1078 - + trace2: cleanup column alignment in perf target format

1079 -

1080 - Output from trace2 subsystem is formatted more prettily now.

1081 -

1082 - Will merge to 'master'.

1083 -

1084 -

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

1178 - reset: unstage empty deleted ita files

1179

@@ -1103,7 +1195,7 @@ of the repositories listed at

1195 "git rebase -i" learned a few options that are known by "git

1196 rebase" proper.

1197

1106 - Is this ready for 'next'?

1198 + Is this ready for 'next'.

1199

1200

1201 * ab/pcre-jit-fixes (2019-08-19) 18 commits

@@ -1129,30 +1221,7 @@ of the repositories listed at

1221

1222 A few simplification and bugfixes to PCRE interface.

1223

1132 - Will merge to 'next'?

1133 -

1134 -

1135 -* dl/rebase-i-keep-base (2019-08-27) 9 commits

1136 - (merged to 'next' on 2019-09-18 at f94f486724)

1137 - + rebase: teach rebase --keep-base

1138 - + rebase tests: test linear branch topology

1139 - + rebase: fast-forward --fork-point in more cases

1140 - + rebase: fast-forward --onto in more cases

1141 - + rebase: refactor can_fast_forward into goto tower

1142 - + t3432: test for --no-ff's interaction with fast-forward

1143 - + t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests

1144 - + t3432: test rebase fast-forward behavior

1145 - + t3431: add rebase --fork-point tests

1146 -

1147 - "git rebase --keep-base <upstream>" tries to find the original base

1148 - of the topic being rebased and rebase on top of that same base,

1149 - which is useful when running the "git rebase -i" (and its limited

1150 - variant "git rebase -x").

1151 -

1152 - The command also has learned to fast-forward in more cases where it

1153 - can instead of replaying to recreate identical commits.

1154 -

1155 - Will merge to 'master'.

1224 + Will merge to 'next'.

1225

1226

1227 * jc/format-patch-noclobber (2019-02-22) 1 commit

What's cooking (2019/10 #01)