bd1a5575ac · 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 (Oct 2019, #01; Thu, 3)

4 -X-master-at: bc12974a897308fd3254cf0cc90319078fe45eea

5 -X-next-at: a346b79a78d4d9c875ed7b855047fb83dcacf05a

3 +Subject: What's cooking in git.git (Oct 2019, #02; Mon, 7)

4 +X-master-at: b744c3af07a15aaeb1b82fab689995fd5528f120

5 +X-next-at: a0afb4120df1aa6aa268d347b87bc5bd5302742c

6

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

7 +What's cooking in git.git (Oct 2019, #02; Mon, 7)

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

9

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

@@ -21,403 +21,490 @@ of the repositories listed at

21 http://git-blame.blogspot.com/p/git-public-repositories.html

22

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

24 -[New Topics]

24 +[Graduated to "master"]

25

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

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

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

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

29

33 - Expecting a reroll.

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

35 - there may be others.

30 + Docfix.

31

32

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

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

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

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

36

44 - Miscellaneous code clean-ups.

37

46 - Will merge to 'next'.

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

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

40 + + Documentation: fix build with Asciidoctor 2

41

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

43 + no longer works with the older one.

44

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

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

45

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

53 - of pointers by mistake.

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

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

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

49

55 - Will merge to 'next'.

50 + Typofix.

51

52

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

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

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

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

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

56

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.

57 + Test portability fix.

58

65 - Will merge to 'next'.

59

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

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

62 + + grep: skip UTF8 checks explicitly

63

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

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

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

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

66

71 - Test fix.

67

73 - Will merge to 'next'.

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

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

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

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

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

73

74 + Cleanup.

75

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

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

76

79 - Dev support.

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

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

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

80

81 - Will merge to 'next'.

81

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

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

84 + + doc: minor formatting fix

85 +

86 + Doc fix.

87

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

85 - - push: add trace2 instrumentation

86 - - fetch: add trace2 instrumentation

88 +

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

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

91 + + Makefile: run coccicheck on more source files

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

93 + + Makefile: define THIRD_PARTY_SOURCES

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

95 +

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

97 +

98 +

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

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

101 + + completion: teach archive to use __gitcomp_builtin

102 + + completion: teach rebase to use __gitcomp_builtin

103 +

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

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

106 +

107 +

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

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

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

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

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

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

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

115 + + apply.h: include missing header

116

117 Dev support.

118

90 - Will merge to 'next'.

119

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

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

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

123

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

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

124 + Docfix.

125

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.

126

102 - Will merge to 'next'.

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

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

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

130

104 ---------------------------------------------------

105 -[Graduated to "master"]

131

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

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

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

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

135 +

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

137 + Python 3.

138 +

139

111 - Windows update.

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

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

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

143 +

144 +

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

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

147 + + commit-graph: turn off save_commit_buffer

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

149

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

151

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

152

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

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

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

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

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

157

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

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

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

161

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

162

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.

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

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

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

166

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

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

169

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.)

170 +

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

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

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

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

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

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

177 +

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

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

180 + code, causing Git to abort.

181 +

182 +

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

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

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

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

187 +

188 + Docfix.

189 +

190 +

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

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

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

194 +

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

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

197 + the repository.

198 +

199 +

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

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

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

203 +

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

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

206 + directory has been fixed.

207 +

208 +

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

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

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

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

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

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

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

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

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

218 +

219 + Doc formatting updates.

220 +

221 +

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

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

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

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

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

227 +

228 + Update support for Asciidoctor documentation toolchain.

229 +

230 +

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

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

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

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

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

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

237 +

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

239 + asciidoctor.

240 +

241 +

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

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

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

245 +

246 + Completion updates.

247 +

248 +

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

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

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

252 +

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

254 +

255 +

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

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

258 + + doc: MyFirstContribution: fix cmd placement instructions

259 +

260 + Docfix.

261 +

262 +

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

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

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

266

267 Code cleanup.

268

269

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 -

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 -

183 -

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 -

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 -

204 -

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

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

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

272 + + commit-graph: use commit_list_count()

273

274 Code cleanup.

275

276

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

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

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

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

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

281 +

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

283 + robust against integer overflows.

284

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

217 - graph after finishing.

285

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

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

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

289

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'

290 + Code simplification.

291

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".

292

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

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

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

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

297

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

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

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

300 + has been corrected.

301

239 - Doc update.

302

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

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

305 + + Test the progress display

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

307

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

308 + Regression fix for progress output.

309

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

310

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

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

313 + + t/helper: ignore only executable files

314

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

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

316

255 - Doc update.

317

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

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

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

321

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

322 + Dev support update.

323

263 - Code cleanup.

324

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

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

327 + + test_date.c: remove reference to GIT_TEST_DATE_NOW

328 + + Quit passing 'now' to date code

329

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

330 + Code simplification.

331

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

332

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

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

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

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

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

338

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

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

340 + robust against corrupted input.

341

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

285 - straightened out.

342

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

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

345 + + stash: make sure to write refreshed cache

346 + + merge: use refresh_and_write_cache

347 + + factor out refresh_and_write_cache function

348

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

349 + "git stash" learned to write refreshed index back to disk.

350

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

351 +--------------------------------------------------

352 +[New Topics]

353

354 +* dl/octopus-graph-bug (2019-10-04) 5 commits

355 + (merged to 'next' on 2019-10-07 at c6bc2fe4a0)

356 + + t4214: demonstrate octopus graph coloring failure

357 + + t4214: explicitly list tags in log

358 + + t4214: generate expect in their own test cases

359 + + t4214: use test_merge

360 + + test-lib: let test_merge() perform octopus merges

361

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

362 + "git log --graph" for an octopus merge is sometimes colored

363 + incorrectly, which is demonstrated and documented but not yet

364 + fixed.

365

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

307 - just like any other directory.

366 + Will merge to 'master'.

367

368

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

369 +* js/azure-pipelines-msvc (2019-10-06) 13 commits

370 + (merged to 'next' on 2019-10-07 at d5a3604dc6)

371 + + ci: also build and test with MS Visual Studio on Azure Pipelines

372 + + ci: really use shallow clones on Azure Pipelines

373 + + tests: let --immediate and --write-junit-xml play well together

374 + + test-tool run-command: learn to run (parts of) the testsuite

375 + + vcxproj: include more generated files

376 + + vcxproj: only copy `git-remote-http.exe` once it was built

377 + + msvc: work around a bug in GetEnvironmentVariable()

378 + + msvc: handle DEVELOPER=1

379 + + msvc: ignore some libraries when linking

380 + + compat/win32/path-utils.h: add #include guards

381 + + winansi: use FLEX_ARRAY to avoid compiler warning

382 + + msvc: avoid using minus operator on unsigned types

383 + + push: do not pretend to return `int` from `die_push_simple()`

384 +

385 + CI updates.

386

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

387 + Will merge to 'master'.

388

389

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

390 +* js/stash-apply-in-secondary-worktree (2019-10-06) 1 commit

391 + (merged to 'next' on 2019-10-07 at b3474c9c3d)

392 + + stash apply: report status correctly even in a worktree's subdirectory

393

321 - Leakfix.

394 + "git stash apply" in a subdirectory of a secondary worktree failed

395 + to access the worktree correctly, which has been corrected.

396

397 + Will merge to 'master'.

398

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

399

329 - A few implementation fixes in the notes API.

400 +* js/trace2-cap-max-output-files (2019-10-05) 4 commits

401 + - trace2: write discard message to sentinel files

402 + - trace2: discard new traces if target directory has too many files

403 + - docs: clarify trace2 version invariants

404 + - docs: mention trace2 target-dir mode in git-config

405

406 + The trace2 output, when sending them to files in a designated

407 + directory, can populate the directory with too many files; a

408 + mechanism is introduced to set the maximum number of files and

409 + discard further logs when the maximum is reached.

410

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

411 + Will merge to 'next'.

412

336 - Leakfix.

413

414 +* kt/add-i-progress (2019-10-04) 1 commit

415 + (merged to 'next' on 2019-10-07 at 00cf8fe076)

416 + + add -i: show progress counter in the prompt

417

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'

418 + "git add -i" has been taught to show the total number of hunks and

419 + the hunks that has been processed so far when showing prompts.

420

343 - Resurrect a performance hack.

421 + Will merge to 'master'.

422

423

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()

424 +* rs/dedup-includes (2019-10-04) 1 commit

425 + (merged to 'next' on 2019-10-07 at 5a4fc44657)

426 + + treewide: remove duplicate #include directives

427

428 Code cleanup.

429

430 + Will merge to 'master'.

431

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

432

358 - Code cleanup.

433 +* bc/hash-independent-tests-part-6 (2019-10-06) 15 commits

434 + - t4048: abstract away SHA-1-specific constants

435 + - t4045: make hash-size independent

436 + - t4044: update test to work with SHA-256

437 + - t4039: abstract away SHA-1-specific constants

438 + - t4038: abstract away SHA-1 specific constants

439 + - t4034: abstract away SHA-1-specific constants

440 + - t4027: make hash-size independent

441 + - t4015: abstract away SHA-1-specific constants

442 + - t4011: abstract away SHA-1-specific constants

443 + - t4010: abstract away SHA-1-specific constants

444 + - t3429: remove SHA1 annotation

445 + - t1305: avoid comparing extensions

446 + - rev-parse: add an --object-format option

447 + - t/oid-info: add empty tree and empty blob values

448 + - t/oid-info: allow looking up hash algorithm name

449 +

450 + Test updates to prepare for SHA-2 transition continues.

451

452 + Will merge to 'next'.

453

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()

454

365 - Code cleanup.

455 +* bw/format-patch-o-create-leading-dirs (2019-10-06) 1 commit

456 + - format-patch: create leading components of output directory

457

458 + "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>"

459 + not "mkdir -p <outdir>", which is being corrected.

460

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()

461 + Use of adjust shared perm on the leading directory may have

462 + security implictions.

463

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

464

465 +* dl/rev-list-doc-cleanup (2019-10-06) 1 commit

466 + (merged to 'next' on 2019-10-07 at 712594feb1)

467 + + git-rev-list.txt: prune options in synopsis

468

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()

469 + Doc update.

470

380 - Code cleanup.

471 + Will merge to 'master'.

472

473

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.)

474 +* py/git-gui-has-maintainer (2019-10-06) 1 commit

475 + (merged to 'next' on 2019-10-07 at 0945190c4c)

476 + + Documentation: update the location of the git-gui repo

477

388 - A bug documentation.

478 + Doc update.

479

480 + Will merge to 'master'.

481

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

482

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

397 - stopped running HTTPD tests.

483 +* rs/convert-fix-utf-without-dash (2019-10-06) 1 commit

484 + (merged to 'next' on 2019-10-07 at 9d0e27b5c3)

485 + + convert: fix handling of dashless UTF prefix in validate_encoding()

486

487 + The code to skip "UTF" and "UTF-" prefix, when computing an advice

488 + message, did not work correctly when the prefix was "UTF", which

489 + has been fixed.

490

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

491 + Will merge to 'master'.

492

404 - Error message fix.

493

494 +* pm/p4-auto-delete-named-temporary (2019-10-06) 1 commit

495 + (merged to 'next' on 2019-10-07 at 4f45be70f5)

496 + + git-p4: auto-delete named temporary file

497

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

498 + Will merge to 'master'.

499

411 - Windows update.

500

501 +* rs/test-remove-useless-debugging-cat (2019-10-07) 1 commit

502 + (merged to 'next' on 2019-10-07 at 6d8cb22a4f)

503 + + tests: remove "cat foo" before "test_i18ngrep bar foo"

504

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

505 + Code cleanup.

506

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.

507 + Will merge to 'master'.

508

509 --------------------------------------------------

510 [Stalled]

@@ -511,399 +598,209 @@ of the repositories listed at

598 --------------------------------------------------

599 [Cooking]

600

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 -

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 -

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 -

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 -

540 - Will merge to 'master'.

541 -

542 -

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 -

549 - Will merge to 'master'.

550 -

551 -

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 -

556 - Code cleanup.

557 -

558 - Will merge to 'master'.

559 -

560 -

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 -

567 - Will merge to 'master'.

568 -

569 -

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 -

576 - Will merge to 'master'.

577 -

578 -

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 -

585 -

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 -

590 - Test fixes.

591 -

592 -

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

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

595 -

596 - Dev support.

597 -

598 - Will merge to 'next'.

599 -

600 -

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 -

605 - Test portability fix.

606 -

607 - Will merge to 'master'.

608 -

609 -

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 -

616 - Cleanup.

617 -

618 - Will merge to 'master'.

619 -

620 -

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 -

630 - Dev support.

631 -

632 - Will merge to 'master'.

633 -

634 -

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 -

645 - Updates to fast-import/export.

646 -

647 - Will merge to 'next'.

648 -

649 -

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 -

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 -

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 -

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

673 - asciidoctor.

674 -

675 - Will merge to 'master'.

676 -

677 -

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

679 - - name-rev: avoid cutoff timestamp underflow

680 -

681 - Integer arith fix.

682 -

683 - Will merge to 'next'.

684 -

685 -

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 -

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 -

699 - Typofix.

700 -

701 - Will merge to 'master'.

702 -

703 -

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 -

732 - Preparation for SHA-256 upgrade continues.

733 -

734 - Will merge to 'next'.

735 -

736 -

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 -

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 -

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 -

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

753 -

754 - Will merge to 'master'.

755 -

756 -

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 -

767 - Doc formatting updates.

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

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

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

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

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

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

607

769 - Will merge to 'master'.

608 + Expecting a reroll.

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

610 + there may be others.

611

612

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

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

614 + (merged to 'next' on 2019-10-04 at 1345f09afb)

615 + + git_mkstemps_mode(): replace magic numbers with computed value

616 + + wrapper: use a loop instead of repetitive statements

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

618 + + commit-graph: remove a duplicate assignment

619

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

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

779 - has been corrected.

620 + Miscellaneous code clean-ups.

621

622 Will merge to 'master'.

623

624

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

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

626 + (merged to 'next' on 2019-10-04 at f3a22d2b18)

627 + + shallow.c: don't free unallocated slabs

628

789 - Code simplification.

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

630 + of pointers by mistake.

631

632 Will merge to 'master'.

633

634

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

635 +* js/fetch-jobs (2019-10-06) 1 commit

636 + (merged to 'next' on 2019-10-07 at e798bac35d)

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

638

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

801 - robust against corrupted input.

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

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

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

642

643 Will merge to 'master'.

644

645

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

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

647 + (merged to 'next' on 2019-10-04 at 0fdb87dd53)

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

649

810 - Doc fix.

650 + Test fix.

651

652 Will merge to 'master'.

653

654

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)

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

656 + (merged to 'next' on 2019-10-07 at 369df0e5cd)

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

658

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

659 + Dev support.

660

661 Will merge to 'master'.

662

663

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

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

665 + (merged to 'next' on 2019-10-04 at 1d63701064)

666 + + push: add trace2 instrumentation

667 + + fetch: add trace2 instrumentation

668

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.

669 + Dev support.

670

671 Will merge to 'master'.

672

673

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

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

675 + (merged to 'next' on 2019-10-04 at 56cf767bdb)

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

677 +

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

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

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

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

682 + by any end-user configuration.

683

684 Will merge to 'master'.

685

686

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

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

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

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

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

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

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

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

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

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

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

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

698 + - grep: fix race conditions on userdiff calls

699

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.

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

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

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

703

854 - Will merge to 'master'.

704

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

706 + - t0028: add more tests

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

708

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

709 + Test fixes.

710

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

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

711 + Will merge to 'next'.

712 +

713 +

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

715 + (merged to 'next' on 2019-10-04 at 135d93143b)

716 + + contrib/buildsystems: fix Visual Studio Debug configuration

717 +

718 + Dev support.

719

720 Will merge to 'master'.

721

722

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

723 +* en/fast-imexport-nested-tags (2019-10-04) 8 commits

724 + (merged to 'next' on 2019-10-07 at 3e75779e10)

725 + + fast-export: handle nested tags

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

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

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

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

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

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

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

733

871 - Completion updates.

734 + Updates to fast-import/export.

735

736 Will merge to 'master'.

737

738

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

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

740 + (merged to 'next' on 2019-10-04 at e02d882510)

741 + + diffcore_rename(): use a stable sort

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

743

880 - Docfix.

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

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

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

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

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

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

750 + results across platforms.

751

752 Will merge to 'master'.

753

754

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

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

756 + (merged to 'next' on 2019-10-04 at 25e4436b3d)

757 + + name-rev: avoid cutoff timestamp underflow

758

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

890 - no longer works with the older one.

759 + Integer arith fix.

760

761 Will merge to 'master'.

762

763

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

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

765 + (merged to 'next' on 2019-10-04 at c1c619f7c4)

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

767 +

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

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

770

771 Will merge to 'master'.

772

773

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

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

775 + (merged to 'next' on 2019-10-04 at b0460b0db2)

776 + + midx: switch to using the_hash_algo

777 + + builtin/show-index: replace sha1_to_hex

778 + + rerere: replace sha1_to_hex

779 + + builtin/receive-pack: replace sha1_to_hex

780 + + builtin/index-pack: replace sha1_to_hex

781 + + packfile: replace sha1_to_hex

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

783 + + cache: remove null_sha1

784 + + builtin/worktree: switch null_sha1 to null_oid

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

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

787 + + sequencer: convert to use the_hash_algo

788 + + bisect: switch to using the_hash_algo

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

790 + + config: use the_hash_algo in abbrev comparison

791 + + combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

792 + + bundle: switch to use the_hash_algo

793 + + connected: switch GIT_SHA1_HEXSZ to the_hash_algo

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

795 + + blame: remove needless comparison with GIT_SHA1_HEXSZ

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

797 + + builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo

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

799 + + fetch-pack: use parse_oid_hex

800 + + patch-id: convert to use the_hash_algo

801 + + builtin/replace: make hash size independent

802

906 - Docfix.

803 + Preparation for SHA-256 upgrade continues.

804

805 Will merge to 'master'.

806

@@ -930,16 +827,6 @@ of the repositories listed at

827 Will merge to 'master'.

828

829

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 -

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 -

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

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

832 + pack-objects: improve partial packfile reuse

@@ -960,96 +847,19 @@ of the repositories listed at

847 cf. <20191002155721.GD6116@sigill.intra.peff.net>

848

849

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 -

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 -

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 -

991 - Docfix.

992 -

993 - Will merge to 'master'.

994 -

995 -

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 -

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

1001 -

1002 - Will merge to 'master'.

1003 -

1004 -

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 -

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

1011 - robust against integer overflows.

1012 -

1013 - Will merge to 'master'.

1014 -

1015 -

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 -

1020 - Code simplification.

1021 -

1022 - Will merge to 'master'.

1023 -

1024 -

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 -

1030 - Regression fix for progress output.

1031 -

1032 - Will merge to 'master'.

1033 -

1034 -

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 -

850 * 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

851 + (merged to 'next' on 2019-10-04 at a2dd896ee8)

852 + + grep: refactor and simplify PCRE1 support

853 + + grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1

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

855

856 PCRE fixes.

857

1049 - Will merge to 'next'.

858 + Will merge to 'master'.

859

860

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

861 +* ew/hashmap (2019-10-07) 20 commits

862 + - hashmap_entry: remove first member requirement from docs

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

864 - OFFSETOF_VAR macro to simplify hashmap iterators

865 - hashmap: introduce hashmap_free_entries

@@ -1072,41 +882,7 @@ of the repositories listed at

882

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

884

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

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

1077 -

1078 -

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 -

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 -

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 -

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

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 -

1109 - Will merge to 'master'.

885 + Will merge to 'next'.

886

887

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

@@ -1164,14 +940,15 @@ of the repositories listed at

940

941

942 * 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

1169 - - rebase -i: always update HEAD before rewording

943 + (merged to 'next' on 2019-10-04 at ab3d7eeb72)

944 + + sequencer: simplify root commit creation

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

946 + + rebase -i: always update HEAD before rewording

947 (this branch is used by ra/rebase-i-more-options.)

948

949 "git rebase -i" showed a wrong HEAD while "reword" open the editor.

950

1174 - Will merge to 'next'.

951 + Will merge to 'master'.

952

953

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

@@ -1195,33 +972,35 @@ of the repositories listed at

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

973 rebase" proper.

974

1198 - Is this ready for 'next'.

975 + Needs to consider existing GIT_COMMITTER_DATE environment, etc.

976 + cf. <5adde732-173b-d24d-d23f-bb4d043076d7@gmail.com>

977

978

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

1202 - - grep: under --debug, show whether PCRE JIT is enabled

1203 - - grep: do not enter PCRE2_UTF mode on fixed matching

1204 - - grep: stess test PCRE v2 on invalid UTF-8 data

1205 - - grep: create a "is_fixed" member in "grep_pat"

1206 - - grep: consistently use "p->fixed" in compile_regexp()

1207 - - grep: stop using a custom JIT stack with PCRE v1

1208 - - grep: stop "using" a custom JIT stack with PCRE v2

1209 - - grep: remove overly paranoid BUG(...) code

1210 - - grep: use PCRE v2 for optimized fixed-string search

1211 - - grep: remove the kwset optimization

1212 - - grep: drop support for \0 in --fixed-strings <pattern>

1213 - - grep: make the behavior for NUL-byte in patterns sane

1214 - - grep tests: move binary pattern tests into their own file

1215 - - grep tests: move "grep binary" alongside the rest

1216 - - grep: inline the return value of a function call used only once

1217 - - t4210: skip more command-line encoding tests on MinGW

1218 - - grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"

1219 - - log tests: test regex backends in "--encode=<enc>" tests

980 + (merged to 'next' on 2019-10-04 at 2d55f2b470)

981 + + grep: under --debug, show whether PCRE JIT is enabled

982 + + grep: do not enter PCRE2_UTF mode on fixed matching

983 + + grep: stess test PCRE v2 on invalid UTF-8 data

984 + + grep: create a "is_fixed" member in "grep_pat"

985 + + grep: consistently use "p->fixed" in compile_regexp()

986 + + grep: stop using a custom JIT stack with PCRE v1

987 + + grep: stop "using" a custom JIT stack with PCRE v2

988 + + grep: remove overly paranoid BUG(...) code

989 + + grep: use PCRE v2 for optimized fixed-string search

990 + + grep: remove the kwset optimization

991 + + grep: drop support for \0 in --fixed-strings <pattern>

992 + + grep: make the behavior for NUL-byte in patterns sane

993 + + grep tests: move binary pattern tests into their own file

994 + + grep tests: move "grep binary" alongside the rest

995 + + grep: inline the return value of a function call used only once

996 + + t4210: skip more command-line encoding tests on MinGW

997 + + grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"

998 + + log tests: test regex backends in "--encode=<enc>" tests

999 (this branch is used by cb/pcre1-cleanup.)

1000

1001 A few simplification and bugfixes to PCRE interface.

1002

1224 - Will merge to 'next'.

1003 + Will merge to 'master'.

1004

1005

1006 * jc/format-patch-noclobber (2019-02-22) 1 commit

What's cooking (2019/10 #02)