61c3ba688d · 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, #02; Mon, 7)

4 -X-master-at: b744c3af07a15aaeb1b82fab689995fd5528f120

5 -X-next-at: a0afb4120df1aa6aa268d347b87bc5bd5302742c

3 +Subject: What's cooking in git.git (Oct 2019, #03; Fri, 11)

4 +X-master-at: 08da6496b61341ec45eac36afcc8f94242763468

5 +X-next-at: b869b98d4c7f0f91d905d76a6c8ba9b8799289b6

6

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

7 +What's cooking in git.git (Oct 2019, #03; Fri, 11)

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

9

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

@@ -23,488 +23,361 @@ of the repositories listed at

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

24 [Graduated to "master"]

25

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 -

30 - Docfix.

31 -

32 -

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 -

37 -

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 -

45 -

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 -

50 - Typofix.

51 -

52 -

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 -

57 - Test portability fix.

58 -

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 -

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 -

67 -

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 -

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 -

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 -

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)

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

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

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

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

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

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

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

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

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

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

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

37 + + grep: remove the kwset optimization

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

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

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

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

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

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

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

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

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

47

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

48 + A few simplification and bugfixes to PCRE interface.

49

50

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

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

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

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

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

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

56 + + commit-graph: remove a duplicate assignment

57

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.

58 + Miscellaneous code clean-ups.

59

60

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

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

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

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

64

65 Dev support.

66

67

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 -

124 - Docfix.

125 -

126 -

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 -

131 -

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 -

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

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

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

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

71

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

73 + of pointers by mistake.

74

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

75

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

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

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

78 + + midx: switch to using the_hash_algo

79 + + builtin/show-index: replace sha1_to_hex

80 + + rerere: replace sha1_to_hex

81 + + builtin/receive-pack: replace sha1_to_hex

82 + + builtin/index-pack: replace sha1_to_hex

83 + + packfile: replace sha1_to_hex

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

85 + + cache: remove null_sha1

86 + + builtin/worktree: switch null_sha1 to null_oid

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

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

89 + + sequencer: convert to use the_hash_algo

90 + + bisect: switch to using the_hash_algo

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

92 + + config: use the_hash_algo in abbrev comparison

93 + + combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

94 + + bundle: switch to use the_hash_algo

95 + + connected: switch GIT_SHA1_HEXSZ to the_hash_algo

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

97 + + blame: remove needless comparison with GIT_SHA1_HEXSZ

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

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

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

101 + + fetch-pack: use parse_oid_hex

102 + + patch-id: convert to use the_hash_algo

103 + + builtin/replace: make hash size independent

104

105 + Preparation for SHA-256 upgrade continues.

106

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

107

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.

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

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

110 + + grep: refactor and simplify PCRE1 support

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

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

113

114 + PCRE fixes.

115

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

116

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

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

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

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

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

120

121 + Doc update.

122

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

123

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.

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

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

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

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

128 + + clean: fix theoretical path corruption

129 + + clean: rewrap overly long line

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

131 + + clean: disambiguate the definition of -d

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

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

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

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

136 + + dir: also check directories for matching pathspecs

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

138 + + dir: fix typo in comment

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

140

141 + "git clean" fixes.

142

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"

143

188 - Docfix.

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

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

146 + + diffcore_rename(): use a stable sort

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

148

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

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

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

152 + location in the original candidate list (which is sorted by path).

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

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

155 + results across platforms.

156

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

157

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.

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

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

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

161

162 + Test fix.

163

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

164

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.

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

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

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

168

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

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

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

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

173 + by any end-user configuration.

174

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

175

219 - Doc formatting updates.

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

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

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

179

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

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

182

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

183

228 - Update support for Asciidoctor documentation toolchain.

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

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

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

187

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

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

190

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

191

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

239 - asciidoctor.

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

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

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

195

196

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

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

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

199 + + sequencer: simplify root commit creation

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

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

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

203

246 - Completion updates.

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

205

206

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

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

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

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

210

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

211 + Doc update.

212

213

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

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

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

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

217

260 - Docfix.

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

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

220 + has been fixed.

221

222

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

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

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

225 + + treewide: remove duplicate #include directives

226

227 Code cleanup.

228

229

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

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

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

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

233

234 Code cleanup.

235

236

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 -

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 -

290 - Code simplification.

291 -

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 -

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 -

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 -

308 - Regression fix for progress output.

309 -

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 -

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

316 -

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 -

322 - Dev support update.

323 -

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 -

330 - Code simplification.

331 -

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

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

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

239 + + name-rev: avoid cutoff timestamp underflow

240

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

340 - robust against corrupted input.

241 + Integer arithmetic fix.

242

243

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

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

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

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

247

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

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

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

250

251 --------------------------------------------------

252 [New Topics]

253

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 -

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

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

364 - fixed.

254 +* ds/sparse-cone (2019-10-08) 17 commits

255 + - sparse-checkout: cone mode should not interact with .gitignore

256 + - sparse-checkout: write using lockfile

257 + - sparse-checkout: update working directory in-process

258 + - sparse-checkout: sanitize for nested folders

259 + - read-tree: show progress by default

260 + - unpack-trees: add progress to clear_ce_flags()

261 + - unpack-trees: hash less in cone mode

262 + - sparse-checkout: init and set in cone mode

263 + - sparse-checkout: use hashmaps for cone patterns

264 + - sparse-checkout: add 'cone' mode

265 + - trace2: add region in clear_ce_flags

266 + - sparse-checkout: create 'disable' subcommand

267 + - sparse-checkout: add '--stdin' option to set subcommand

268 + - sparse-checkout: 'set' subcommand

269 + - clone: add --sparse mode

270 + - sparse-checkout: create 'init' subcommand

271 + - sparse-checkout: create builtin with 'list' subcommand

272 +

273 + Management of sparsely checked-out working tree has gained a

274 + dedicated "sparse-checkout" command.

275 +

276 + Seems not to play well with the hashmap updates.

277 +

278 +

279 +* dl/format-patch-doc-test-cleanup (2019-10-09) 1 commit

280 + (merged to 'next' on 2019-10-11 at 992da06f37)

281 + + t4014: treat rev-list output as the expected value

282 +

283 + test cleanup.

284

285 Will merge to 'master'.

286

287

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

288 +* dl/t0000-skip-test-test (2019-10-09) 1 commit

289 + (merged to 'next' on 2019-10-11 at b210c1d1fa)

290 + + t0000: cover GIT_SKIP_TESTS blindspots

291

385 - CI updates.

292 + test update.

293

294 Will merge to 'master'.

295

296

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

297 +* gs/sq-quote-buf-pretty (2019-10-08) 1 commit

298 + (merged to 'next' on 2019-10-11 at 2f7c00612b)

299 + + sq_quote_buf_pretty: don't drop empty arguments

300

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

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

301 + Pretty-printed command line formatter (used in e.g. reporting the

302 + command being run by the tracing API) had a bug that lost an

303 + argument that is an empty string, which has been corrected.

304

305 Will merge to 'master'.

306

307

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

308 +* jk/coc (2019-10-10) 2 commits

309 + (merged to 'next' on 2019-10-11 at 9765fd29c3)

310 + + CODE_OF_CONDUCT: mention individual project-leader emails

311 + + add a Code of Conduct document

312

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 -

411 - Will merge to 'next'.

412 -

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 -

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.

313 + Code-of-conduct document.

314

315 Will merge to 'master'.

316

317

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

318 +* js/xdiffi-comment-updates (2019-10-09) 1 commit

319 + (merged to 'next' on 2019-10-11 at 157226cf3a)

320 + + xdiffi: fix typos and touch up comments

321

428 - Code cleanup.

322 + Comment update.

323

324 Will merge to 'master'.

325

326

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.

327 +* jt/push-avoid-lazy-fetch (2019-10-09) 1 commit

328 + (merged to 'next' on 2019-10-11 at b5efe1634a)

329 + + send-pack: never fetch when checking exclusions

330

452 - Will merge to 'next'.

331 + Performance hack.

332

333 + Will merge to 'master'.

334

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

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

335

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

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

336 +* tg/range-diff-output-update (2019-10-09) 1 commit

337 + (merged to 'next' on 2019-10-11 at fd8c5d7ec5)

338 + + range-diff: don't segfault with mode-only changes

339

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

462 - security implictions.

340 + "git range-diff" failed to handle mode-only change, which has been

341 + corrected.

342

343 + Will merge to 'master'.

344

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

345

469 - Doc update.

346 +* wb/fsmonitor-bitmap-fix (2019-10-10) 1 commit

347 + - fsmonitor: don't fill bitmap with entries to be removed

348

471 - Will merge to 'master'.

349 + A segfault fix.

350

351 + Perhaps an update to the test script may be worth doing?

352 + cf. <20191010110732.GJ29845@szeder.dev>

353

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

354

478 - Doc update.

355 +* dl/compat-cleanup (2019-10-11) 1 commit

356 + - pthread.h: manually align parameter lists

357

480 - Will merge to 'master'.

358 + Code formatting micronit fix.

359

360 + Will merge to 'next'.

361

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

362

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.

363 +* jj/stash-reset-only-toplevel (2019-10-11) 1 commit

364 + - stash: avoid recursive hard reset on submodules

365

491 - Will merge to 'master'.

366

367 +* js/doc-stash-save (2019-10-11) 1 commit

368 + - doc(stash): clarify the description of `save`

369

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

370 + Doc clarification.

371

498 - Will merge to 'master'.

372 + Will merge to 'next'.

373

374

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"

375 +* ta/t1308-typofix (2019-10-11) 1 commit

376 + - t1308-config-set: fix a test that has a typo

377

505 - Code cleanup.

378 + Test fix.

379

507 - Will merge to 'master'.

380 + Will merge to 'next'.

381

382 --------------------------------------------------

383 [Stalled]

@@ -519,14 +392,12 @@ of the repositories listed at

392 cf. <CAPUEspjJNSrJQT7xV2fsdp2t5odW5fzzPdDxuar_5x_JPUtf6Q@mail.gmail.com>

393

394

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

523 - - documentation: add tutorial for revision walking

395 +* es/walken-tutorial (2019-10-11) 2 commits

396 + - SQUASH???

397 + - documentation: add tutorial for object walking

398

399 A tutorial on object enumeration.

400

527 - Perhaps take the thing with as little tweaks as possible, retitling

528 - it to "my first object enumeration" or something?

529 - cf. <20190814183328.GA40797@google.com>

401

402

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

@@ -557,79 +428,142 @@ of the repositories listed at

428 may help working around a suspected bug in GMail MSA, reported at

429 <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>

430

560 - Waiting for feedback to see if it truly helps.

561 - Needs tests.

431 + Waiting for feedback to see if it truly helps.

432 + Needs tests.

433 +

434 +

435 +* jt/fetch-cdn-offload (2019-03-12) 9 commits

436 + - SQUASH???

437 + - upload-pack: send part of packfile response as uri

438 + - fetch-pack: support more than one pack lockfile

439 + - upload-pack: refactor reading of pack-objects out

440 + - Documentation: add Packfile URIs design doc

441 + - Documentation: order protocol v2 sections

442 + - http-fetch: support fetching packfiles by URL

443 + - http: improve documentation of http_pack_request

444 + - http: use --stdin when getting dumb HTTP pack

445 +

446 + WIP for allowing a response to "git fetch" to instruct the bulk of

447 + the pack contents to be instead taken from elsewhere (aka CDN).

448 +

449 +

450 +* js/protocol-advertise-multi (2018-12-28) 1 commit

451 + - protocol: advertise multiple supported versions

452 +

453 + The transport layer has been updated so that the protocol version

454 + used can be negotiated between the parties, by the initiator

455 + listing the protocol versions it is willing to talk, and the other

456 + side choosing from one of them.

457 +

458 + Expecting a reroll.

459 + cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>

460 +

461 +

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

463 + - zlib.c: use size_t for size

464 +

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

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

467 + updated to use "size_t".

468 +

469 +--------------------------------------------------

470 +[Cooking]

471 +

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

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

474 + + t4214: demonstrate octopus graph coloring failure

475 + + t4214: explicitly list tags in log

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

477 + + t4214: use test_merge

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

479 +

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

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

482 + fixed.

483 +

484 + Will merge to 'master'.

485 +

486 +

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

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

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

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

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

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

493 + + vcxproj: include more generated files

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

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

496 + + msvc: handle DEVELOPER=1

497 + + msvc: ignore some libraries when linking

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

499 + + winansi: use FLEX_ARRAY to avoid compiler warning

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

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

502 +

503 + CI updates.

504 +

505 + Will merge to 'master'.

506

507

564 -* jt/fetch-cdn-offload (2019-03-12) 9 commits

565 - - SQUASH???

566 - - upload-pack: send part of packfile response as uri

567 - - fetch-pack: support more than one pack lockfile

568 - - upload-pack: refactor reading of pack-objects out

569 - - Documentation: add Packfile URIs design doc

570 - - Documentation: order protocol v2 sections

571 - - http-fetch: support fetching packfiles by URL

572 - - http: improve documentation of http_pack_request

573 - - http: use --stdin when getting dumb HTTP pack

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

509 + (merged to 'next' on 2019-10-09 at e8a126d880)

510 + + trace2: write discard message to sentinel files

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

512 + + docs: clarify trace2 version invariants

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

514

575 - WIP for allowing a response to "git fetch" to instruct the bulk of

576 - the pack contents to be instead taken from elsewhere (aka CDN).

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

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

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

518 + discard further logs when the maximum is reached.

519

520 + Will merge to 'master'.

521

579 -* js/protocol-advertise-multi (2018-12-28) 1 commit

580 - - protocol: advertise multiple supported versions

522

582 - The transport layer has been updated so that the protocol version

583 - used can be negotiated between the parties, by the initiator

584 - listing the protocol versions it is willing to talk, and the other

585 - side choosing from one of them.

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

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

525 + - t4045: make hash-size independent

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

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

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

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

530 + - t4027: make hash-size independent

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

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

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

534 + - t3429: remove SHA1 annotation

535 + - t1305: avoid comparing extensions

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

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

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

539

587 - Expecting a reroll.

588 - cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>

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

541

542 + May be rerolled.

543 + cf. <20191008194012.4s35pbwbh25rblhb@camp.crustytoothpaste.net>

544

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

592 - - zlib.c: use size_t for size

545

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

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

596 - updated to use "size_t".

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

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

548

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

599 -[Cooking]

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

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

551 +

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

553 + security implictions.

554

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

555 +

556 +* ag/sequencer-todo-updates (2019-10-08) 5 commits

557 - sequencer: directly call pick_commits() from complete_action()

558 - rebase: fill `squash_onto' in get_replay_opts()

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

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

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

562

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 -

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 -

620 - Miscellaneous code clean-ups.

621 -

622 - Will merge to 'master'.

623 -

624 -

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 -

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

630 - of pointers by mistake.

563 + Reduce unnecessary reading of state variables back from the disk

564 + during sequener operation.

565

632 - Will merge to 'master'.

566 + Will merge to 'next'.

567

568

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

@@ -643,15 +577,6 @@ of the repositories listed at

577 Will merge to 'master'.

578

579

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 -

650 - Test fix.

651 -

652 - Will merge to 'master'.

653 -

654 -

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

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

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

@@ -661,7 +586,9 @@ of the repositories listed at

586 Will merge to 'master'.

587

588

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

589 +* js/trace2-fetch-push (2019-10-08) 3 commits

590 + (merged to 'next' on 2019-10-11 at 3a2bb143f8)

591 + + transport: push codepath can take arbitrary repository

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

593 + push: add trace2 instrumentation

594 + fetch: add trace2 instrumentation

@@ -671,19 +598,6 @@ of the repositories listed at

598 Will merge to 'master'.

599

600

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 -

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

602 - grep: move driver pre-load out of critical section

603 - grep: re-enable threads in non-worktree case

@@ -703,20 +617,12 @@ of the repositories listed at

617

618

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

706 - - t0028: add more tests

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

620 + (merged to 'next' on 2019-10-09 at 453900a4e8)

621 + + t0028: add more tests

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

623

624 Test fixes.

625

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 -

626 Will merge to 'master'.

627

628

@@ -736,97 +642,6 @@ of the repositories listed at

642 Will merge to 'master'.

643

644

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 -

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 -

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 -

759 - Integer arith fix.

760 -

761 - Will merge to 'master'.

762 -

763 -

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 -

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 -

803 - Preparation for SHA-256 upgrade continues.

804 -

805 - Will merge to 'master'.

806 -

807 -

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

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

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

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

812 - + clean: fix theoretical path corruption

813 - + clean: rewrap overly long line

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

815 - + clean: disambiguate the definition of -d

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

817 - + dir: add commentary explaining match_pathspec_item's return value

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

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

820 - + dir: also check directories for matching pathspecs

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

822 - + dir: fix typo in comment

823 - + t7300: add testcases showing failure to clean specified pathspecs

824 -

825 - "git clean" fixes.

826 -

827 - Will merge to 'master'.

828 -

829 -

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

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

647 + pack-objects: improve partial packfile reuse

@@ -847,42 +662,32 @@ of the repositories listed at

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

663

664

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

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 -

858 - Will merge to 'master'.

859 -

860 -

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

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

867 - - hashmap: use *_entry APIs for iteration

868 - - hashmap_cmp_fn takes hashmap_entry params

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

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

871 - - hashmap_get_next returns "struct hashmap_entry *"

872 - - introduce container_of macro

873 - - hashmap_put takes "struct hashmap_entry *"

874 - - hashmap_remove takes "const struct hashmap_entry *"

875 - - hashmap_get takes "const struct hashmap_entry *"

876 - - hashmap_add takes "struct hashmap_entry *"

877 - - hashmap_get_next takes "const struct hashmap_entry *"

878 - - hashmap_entry_init takes "struct hashmap_entry *"

879 - - packfile: use hashmap_entry in delta_base_cache_entry

880 - - coccicheck: detect hashmap_entry.hash assignment

881 - - diff: use hashmap_entry_init on moved_entry.ent

666 + (merged to 'next' on 2019-10-09 at 9b75b4ce73)

667 + + hashmap_entry: remove first member requirement from docs

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

669 + + OFFSETOF_VAR macro to simplify hashmap iterators

670 + + hashmap: introduce hashmap_free_entries

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

672 + + hashmap: use *_entry APIs for iteration

673 + + hashmap_cmp_fn takes hashmap_entry params

674 + + hashmap_get{,_from_hash} return "struct hashmap_entry *"

675 + + hashmap: use *_entry APIs to wrap container_of

676 + + hashmap_get_next returns "struct hashmap_entry *"

677 + + introduce container_of macro

678 + + hashmap_put takes "struct hashmap_entry *"

679 + + hashmap_remove takes "const struct hashmap_entry *"

680 + + hashmap_get takes "const struct hashmap_entry *"

681 + + hashmap_add takes "struct hashmap_entry *"

682 + + hashmap_get_next takes "const struct hashmap_entry *"

683 + + hashmap_entry_init takes "struct hashmap_entry *"

684 + + packfile: use hashmap_entry in delta_base_cache_entry

685 + + coccicheck: detect hashmap_entry.hash assignment

686 + + diff: use hashmap_entry_init on moved_entry.ent

687

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

689

885 - Will merge to 'next'.

690 + Will merge to 'master'.

691

692

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

@@ -903,7 +708,9 @@ of the repositories listed at

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

709

710

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

711 +* en/merge-recursive-cleanup (2019-10-08) 26 commits

712 + (merged to 'next' on 2019-10-09 at aab23cae2e)

713 + + merge-recursive: fix the fix to the diff3 common ancestor label

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

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

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

@@ -939,18 +746,6 @@ of the repositories listed at

746 Will merge to 'master'.

747

748

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

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 -

951 - Will merge to 'master'.

952 -

953 -

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

750 - reset: unstage empty deleted ita files

751

@@ -967,7 +762,6 @@ of the repositories listed at

762 - rebase -i: support --committer-date-is-author-date

763 - sequencer: allow callers of read_author_script() to ignore fields

764 - rebase -i: add --ignore-whitespace flag

970 - (this branch uses pw/rebase-i-show-HEAD-to-reword.)

765

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

767 rebase" proper.

@@ -976,33 +770,6 @@ of the repositories listed at

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

771

772

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

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 -

1003 - Will merge to 'master'.

1004 -

1005 -

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

774 - format-patch: --no-clobber refrains from overwriting output files

775

What's cooking (2019/10 #03)