87d2ac989c · 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, #04; Tue, 15)

4 -X-master-at: 108b97dc372828f0e72e56bbb40cae8e1e83ece6

5 -X-next-at: 75c0f4853af2bb694809b26e5840ced649a83e49

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

4 +X-master-at: d966095db01190a2196e31195ea6fa0c722aa732

5 +X-next-at: 954a862665455a25876e1113bd865d43a26facce

6

7 -What's cooking in git.git (Oct 2019, #04; Tue, 15)

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

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

9

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

@@ -20,536 +20,271 @@ of the repositories listed at

20 --------------------------------------------------

21 [Graduated to "master"]

22

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

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

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

26 - + grep: do not enter PCRE2_UTF mode on fixed matching

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

28 - + grep: create a "is_fixed" member in "grep_pat"

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

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

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

32 - + grep: remove overly paranoid BUG(...) code

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

34 - + grep: remove the kwset optimization

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

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

37 - + grep tests: move binary pattern tests into their own file

38 - + grep tests: move "grep binary" alongside the rest

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

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

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

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

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

44 -

45 - A few simplification and bugfixes to PCRE interface.

46 -

47 -

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

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

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

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

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

53 - + commit-graph: remove a duplicate assignment

54 -

55 - Miscellaneous code clean-ups.

56 -

57 -

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

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

60 - + t0028: add more tests

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

62 -

63 - Test fixes.

64 -

65 -

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

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

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

69 -

70 - Dev support.

71 -

72 -

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

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

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

76 -

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

78 - of pointers by mistake.

79 -

80 -

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

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

83 - + midx: switch to using the_hash_algo

84 - + builtin/show-index: replace sha1_to_hex

85 - + rerere: replace sha1_to_hex

86 - + builtin/receive-pack: replace sha1_to_hex

87 - + builtin/index-pack: replace sha1_to_hex

88 - + packfile: replace sha1_to_hex

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

90 - + cache: remove null_sha1

91 - + builtin/worktree: switch null_sha1 to null_oid

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

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

94 - + sequencer: convert to use the_hash_algo

95 - + bisect: switch to using the_hash_algo

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

97 - + config: use the_hash_algo in abbrev comparison

98 - + combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo

99 - + bundle: switch to use the_hash_algo

100 - + connected: switch GIT_SHA1_HEXSZ to the_hash_algo

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

102 - + blame: remove needless comparison with GIT_SHA1_HEXSZ

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

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

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

106 - + fetch-pack: use parse_oid_hex

107 - + patch-id: convert to use the_hash_algo

108 - + builtin/replace: make hash size independent

109 -

110 - Preparation for SHA-256 upgrade continues.

111 -

112 -

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

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

115 - + grep: refactor and simplify PCRE1 support

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

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

118 -

119 - PCRE fixes.

120 -

121 -

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

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

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

125 - (this branch is used by dl/format-patch-cover-from-desc.)

126 -

127 - test cleanup.

128 -

129 -

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

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

132 - + t4214: demonstrate octopus graph coloring failure

133 - + t4214: explicitly list tags in log

134 - + t4214: generate expect in their own test cases

135 - + t4214: use test_merge

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

137 -

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

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

140 - fixed.

141 -

142 -

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

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

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

146 -

147 - Doc update.

148 -

149 -

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

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

152 - + t0000: cover GIT_SKIP_TESTS blindspots

153 -

154 - test update.

155 -

156 -

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

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

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

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

161 - + clean: fix theoretical path corruption

162 - + clean: rewrap overly long line

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

164 - + clean: disambiguate the definition of -d

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

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

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

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

169 - + dir: also check directories for matching pathspecs

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

171 - + dir: fix typo in comment

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

173 -

174 - "git clean" fixes.

175 -

176 -

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

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

179 - + fast-export: handle nested tags

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

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

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

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

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

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

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

187 -

188 - Updates to fast-import/export.

189 -

190 -

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

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

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

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

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

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

197 - + merge-recursive: alphabetize include list

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

199 - + merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*

200 - + merge-recursive: split internal fields into a separate struct

201 - + merge-recursive: avoid losing output and leaking memory holding that output

202 - + merge-recursive: comment and reorder the merge_options fields

203 - + merge-recursive: consolidate unnecessary fields in merge_options

204 - + merge-recursive: move some definitions around to clean up the header

205 - + merge-recursive: rename merge_options argument to opt in header

206 - + merge-recursive: rename 'mrtree' to 'result_tree', for clarity

207 - + merge-recursive: use common name for ancestors/common/base_list

208 - + merge-recursive: fix some overly long lines

209 - + cache-tree: share code between functions writing an index as a tree

210 - + merge-recursive: don't force external callers to do our logging

211 - + merge-recursive: remove useless parameter in merge_trees()

212 - + merge-recursive: exit early if index != head

213 - + Ensure index matches head before invoking merge machinery, round N

214 - + merge-recursive: remove another implicit dependency on the_repository

215 - + merge-recursive: future-proof update_file_flags() against memory leaks

216 - + merge-recursive: introduce an enum for detect_directory_renames values

217 - + merge-recursive: provide a better label for diff3 common ancestor

218 - + merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()

219 - + checkout: provide better conflict hunk description with detached HEAD

220 - + merge-recursive: be consistent with assert

221 -

222 - The merge-recursive machiery is one of the most complex parts of

223 - the system that accumulated cruft over time. This large series

224 - cleans up the implementation quite a bit.

225 -

226 -

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

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

229 - + hashmap_entry: remove first member requirement from docs

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

231 - + OFFSETOF_VAR macro to simplify hashmap iterators

232 - + hashmap: introduce hashmap_free_entries

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

234 - + hashmap: use *_entry APIs for iteration

235 - + hashmap_cmp_fn takes hashmap_entry params

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

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

238 - + hashmap_get_next returns "struct hashmap_entry *"

239 - + introduce container_of macro

240 - + hashmap_put takes "struct hashmap_entry *"

241 - + hashmap_remove takes "const struct hashmap_entry *"

242 - + hashmap_get takes "const struct hashmap_entry *"

243 - + hashmap_add takes "struct hashmap_entry *"

244 - + hashmap_get_next takes "const struct hashmap_entry *"

245 - + hashmap_entry_init takes "struct hashmap_entry *"

246 - + packfile: use hashmap_entry in delta_base_cache_entry

247 - + coccicheck: detect hashmap_entry.hash assignment

248 - + diff: use hashmap_entry_init on moved_entry.ent

249 -

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

251 -

252 -

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

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

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

256 -

257 - Dev support.

258 -

259 -

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

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

262 - + sq_quote_buf_pretty: don't drop empty arguments

263 -

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

265 - command being run by the tracing API) had a bug that lost an

266 - argument that is an empty string, which has been corrected.

267 -

268 -

269 -* jk/coc (2019-10-10) 2 commits

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

271 - + CODE_OF_CONDUCT: mention individual project-leader emails

272 - + add a Code of Conduct document

273 -

274 - Code-of-conduct document.

275 -

276 -

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

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

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

280 - + ci: really use shallow clones on Azure Pipelines

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

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

283 - + vcxproj: include more generated files

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

285 - + msvc: work around a bug in GetEnvironmentVariable()

286 - + msvc: handle DEVELOPER=1

287 - + msvc: ignore some libraries when linking

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

289 - + winansi: use FLEX_ARRAY to avoid compiler warning

290 - + msvc: avoid using minus operator on unsigned types

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

292 -

293 - CI updates.

294 -

295 -

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

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

298 - + diffcore_rename(): use a stable sort

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

300 -

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

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

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

304 - location in the original candidate list (which is sorted by path).

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

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

307 - results across platforms.

308 -

309 -

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

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

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

313 -

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

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

316 - fetches from multiple remote repositories. It now does.

317 -

318 -

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

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

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

23 +* bb/compat-util-comment-fix (2019-10-12) 1 commit

24 + (merged to 'next' on 2019-10-15 at c15e45fe28)

25 + + git-compat-util: fix documentation syntax

26

323 - Test fix.

27 + Code cleanup.

28

29

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

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

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

30 +* bb/utf8-wcwidth-cleanup (2019-10-12) 1 commit

31 + (merged to 'next' on 2019-10-15 at 92ba59e1d6)

32 + + utf8: use ARRAY_SIZE() in git_wcwidth()

33

330 - "git range-diff" segfaulted when diff.noprefix configuration was

331 - used, as it blindly expected the patch it internally generates to

332 - have the standard a/ and b/ prefixes. The command now forces the

333 - internal patch to be built without any prefix, not to be affected

334 - by any end-user configuration.

34 + Code cleanup.

35

36

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

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

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

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

38 + (merged to 'next' on 2019-10-15 at 93c9949b6a)

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

40

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

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

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

42 + not "mkdir -p <outdir>", which got corrected.

43

44

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

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

347 - + trace2: write discard message to sentinel files

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

349 - + docs: clarify trace2 version invariants

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

45 +* dl/allow-running-cocci-verbosely (2019-10-12) 1 commit

46 + (merged to 'next' on 2019-10-15 at 474dc9f86e)

47 + + Makefile: respect $(V) in %.cocci.patch target

48

352 - The trace2 output, when sending them to files in a designated

353 - directory, can populate the directory with too many files; a

354 - mechanism is introduced to set the maximum number of files and

355 - discard further logs when the maximum is reached.

49 + Dev support update.

50

51

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

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

360 - + transport: push codepath can take arbitrary repository

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

362 - + push: add trace2 instrumentation

363 - + fetch: add trace2 instrumentation

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

53 + (merged to 'next' on 2019-10-15 at 1ed99770ba)

54 + + pthread.h: manually align parameter lists

55

365 - Dev support.

56 + Code formatting micronit fix.

57

58

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

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

370 - + xdiffi: fix typos and touch up comments

59 +* jj/stash-reset-only-toplevel (2019-10-15) 1 commit

60 + (merged to 'next' on 2019-10-15 at 28f398daab)

61 + + stash: avoid recursive hard reset on submodules

62

372 - Comment update.

63 + "git stash save" lost local changes to submodules, which has been

64 + corrected.

65

66

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

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

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

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

68 + (merged to 'next' on 2019-10-15 at e588bff32c)

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

70

379 - Performance hack.

71 + Doc clarification.

72

73

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

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

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

74 +* rs/column-use-utf8-strnwidth (2019-10-15) 1 commit

75 + (merged to 'next' on 2019-10-15 at 3be15b4478)

76 + + column: use utf8_strnwidth() to strip out ANSI color escapes

77

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

387 - the hunks that has been processed so far when showing prompts.

78 + Code cleanup.

79

80

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

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

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

81 +* rs/http-push-simplify (2019-10-15) 1 commit

82 + (merged to 'next' on 2019-10-15 at 4abc29286c)

83 + + http-push: simplify deleting a list item

84

85 + Code cleanup.

86

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

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

397 - + sequencer: simplify root commit creation

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

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

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

87

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

88 +* rs/remote-curl-use-argv-array (2019-10-15) 1 commit

89 + (merged to 'next' on 2019-10-15 at 8d0375a874)

90 + + remote-curl: use argv_array in parse_push()

91

92 + Code cleanup.

93

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

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

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

94

409 - Doc update.

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

96 + (merged to 'next' on 2019-10-15 at 0228b44688)

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

98

99 + Test fix.

100

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

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

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

101 +--------------------------------------------------

102 +[New Topics]

103

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

417 - message, did not work correctly when the prefix was "UTF", which

418 - has been fixed.

104 +* dd/notes-copy-default-dst-to-head (2019-10-18) 2 commits

105 + (merged to 'next' on 2019-10-18 at 2588a175ec)

106 + + notes: fix minimum number of parameters to "copy" subcommand

107 + + t3301: test diagnose messages for too few/many paramters

108 +

109 + "git notes copy $original" ought to copy the notes attached to the

110 + original object to HEAD, but a mistaken tightening to command line

111 + parameter validation made earlier disabled that feature by mistake.

112 +

113 + Will cook in 'next'.

114 + No need for rush, as this is a fix for an ancient regression.

115 +

116 +

117 +* jc/log-graph-simplify (2019-10-16) 13 commits

118 + - graph: fix coloring of octopus dashes

119 + - graph: flatten edges that fuse with their right neighbor

120 + - graph: smooth appearance of collapsing edges on commit lines

121 + - graph: rename `new_mapping` to `old_mapping`

122 + - graph: commit and post-merge lines for left-skewed merges

123 + - graph: tidy up display of left-skewed merges

124 + - graph: example of graph output that can be simplified

125 + - graph: extract logic for moving to GRAPH_PRE_COMMIT state

126 + - graph: remove `mapping_idx` and `graph_update_width()`

127 + - graph: reduce duplication in `graph_insert_into_new_columns()`

128 + - graph: reuse `find_new_column_by_commit()`

129 + - graph: handle line padding in `graph_next_line()`

130 + - graph: automatically track display width of graph lines

131 +

132 + The implementation of "git log --graph" got refactored and then its

133 + output got simplified.

134

135 + Will merge to 'next'.

136

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

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

423 - + treewide: remove duplicate #include directives

137

425 - Code cleanup.

138 +* js/azure-ci-osx-fix (2019-10-18) 1 commit

139 + (merged to 'next' on 2019-10-18 at bc6a502f6e)

140 + + ci(osx): use new location of the `perforce` cask

141

142 + Update installation procedure for Perforce on MacOS in the CI jobs

143 + running on Azure pipelines, which was failing.

144

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

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

430 - + tests: remove "cat foo" before "test_i18ngrep bar foo"

145 + Will merge to 'master'.

146

432 - Code cleanup.

147

148 +* js/git-path-head-dot-lock-fix (2019-10-18) 2 commits

149 + - git_path(): handle `.lock` files correctly

150 + - t1400: wrap setup code in test case

151

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

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

437 - + name-rev: avoid cutoff timestamp underflow

152 + "git rev-parse --git-path HEAD.lock" did not give the right path

153 + when run in a secondary worktree.

154

439 - Integer arithmetic fix.

155

156 +* pw/post-commit-from-sequencer (2019-10-16) 6 commits

157 + (merged to 'next' on 2019-10-18 at 15b41a097d)

158 + + sequencer: run post-commit hook

159 + + move run_commit_hook() to libgit and use it there

160 + + sequencer.h fix placement of #endif

161 + + t3404: remove uneeded calls to set_fake_editor

162 + + t3404: set $EDITOR in subshell

163 + + t3404: remove unnecessary subshell

164

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

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

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

165 + "rebase -i" ceased to run post-commit hook by mistake in an earlier

166 + update, which has been corrected.

167

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

447 - corrected.

168 + Will merge to 'master'.

169

170 +--------------------------------------------------

171 +[Stalled]

172

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

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

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

173 +* ra/rebase-i-more-options (2019-09-09) 6 commits

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

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

176 + - sequencer: rename amend_author to author_to_rename

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

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

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

180

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

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

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

182 + rebase" proper.

183

457 ---------------------------------------------------

458 -[New Topics]

184 + Needs to consider existing GIT_COMMITTER_DATE environment, etc.

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

186

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

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

462 - . sparse-checkout: write using lockfile

463 - . sparse-checkout: update working directory in-process

464 - . sparse-checkout: sanitize for nested folders

465 - . read-tree: show progress by default

466 - . unpack-trees: add progress to clear_ce_flags()

467 - . unpack-trees: hash less in cone mode

468 - . sparse-checkout: init and set in cone mode

469 - . sparse-checkout: use hashmaps for cone patterns

470 - . sparse-checkout: add 'cone' mode

471 - . trace2: add region in clear_ce_flags

472 - . sparse-checkout: create 'disable' subcommand

473 - . sparse-checkout: add '--stdin' option to set subcommand

474 - . sparse-checkout: 'set' subcommand

475 - . clone: add --sparse mode

476 - . sparse-checkout: create 'init' subcommand

477 - . sparse-checkout: create builtin with 'list' subcommand

187

479 - Management of sparsely checked-out working tree has gained a

480 - dedicated "sparse-checkout" command.

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

189 + - reset: unstage empty deleted ita files

190

482 - Expecting a reroll on top of we/hashmap.

483 - The use of hashmap API does not work well with ew/hashmap updates

484 - and breaks build.

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

192 + added with the intent-to-add bit.

193

194 + Expecting a reroll.

195

487 -* wb/fsmonitor-bitmap-fix (2019-10-12) 1 commit

488 - (merged to 'next' on 2019-10-15 at 1cc4091346)

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

196

491 - A segfault fix.

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

198 + - index: offer advice for unknown index extensions

199 + - index: do not warn about unrecognized extensions

200

493 - Will merge to 'master'.

201 + A bit too alarming warning given when unknown index extensions

202 + exist is getting revamped.

203

204 + Expecting a reroll.

205

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

497 - (merged to 'next' on 2019-10-15 at 1ed99770ba)

498 - + pthread.h: manually align parameter lists

206

500 - Code formatting micronit fix.

207 +* jc/format-patch-delay-message-id (2019-04-05) 1 commit

208 + - format-patch: move message-id and related headers to the end

209

502 - Will merge to 'master'.

210 + The location "git format-patch --thread" adds the Message-Id:

211 + header in the series of header fields has been moved down, which

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

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

214

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

216 + Needs tests.

217

505 -* jj/stash-reset-only-toplevel (2019-10-15) 1 commit

506 - (merged to 'next' on 2019-10-15 at 28f398daab)

507 - + stash: avoid recursive hard reset on submodules

218

509 - "git stash save" lost local changes to submodules, which has been

510 - corrected.

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

220 + - protocol: advertise multiple supported versions

221

512 - Will merge to 'master'.

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

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

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

225 + side choosing from one of them.

226

227 + Expecting a reroll.

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

229

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

516 - (merged to 'next' on 2019-10-15 at e588bff32c)

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

230

519 - Doc clarification.

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

232 + - zlib.c: use size_t for size

233

521 - Will merge to 'master'.

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

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

236 + updated to use "size_t".

237

238 +--------------------------------------------------

239 +[Cooking]

240

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

525 - (merged to 'next' on 2019-10-15 at 0228b44688)

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

241 +* cb/pcre2-chartables-leakfix (2019-10-18) 3 commits

242 + (merged to 'next' on 2019-10-18 at 5bc67c64fd)

243 + + grep: avoid leak of chartables in PCRE2

244 + + grep: make PCRE2 aware of custom allocator

245 + + grep: make PCRE1 aware of custom allocator

246

528 - Test fix.

247 + Leakfix.

248

249 Will merge to 'master'.

250

251

533 -* bb/compat-util-comment-fix (2019-10-12) 1 commit

534 - (merged to 'next' on 2019-10-15 at c15e45fe28)

535 - + git-compat-util: fix documentation syntax

252 +* ds/sparse-cone (2019-10-16) 17 commits

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

254 + - sparse-checkout: write using lockfile

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

256 + - sparse-checkout: sanitize for nested folders

257 + - read-tree: show progress by default

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

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

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

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

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

263 + - trace2: add region in clear_ce_flags

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

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

266 + - sparse-checkout: 'set' subcommand

267 + - clone: add --sparse mode

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

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

270

537 - Code cleanup.

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

272 + dedicated "sparse-checkout" command.

273

539 - Will merge to 'master'.

274 + Will merge to 'next'.

275

276

542 -* bb/utf8-wcwidth-cleanup (2019-10-12) 1 commit

543 - (merged to 'next' on 2019-10-15 at 92ba59e1d6)

544 - + utf8: use ARRAY_SIZE() in git_wcwidth()

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

278 + (merged to 'next' on 2019-10-15 at 1cc4091346)

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

280

546 - Code cleanup.

281 + A segfault fix.

282

283 Will merge to 'master'.

284

285

551 -* bc/smart-http-atomic-push (2019-10-15) 1 commit

552 - (merged to 'next' on 2019-10-15 at effe020c20)

286 +* bc/smart-http-atomic-push (2019-10-17) 1 commit

287 + (merged to 'next' on 2019-10-18 at 7729d13f51)

288 + remote-curl: pass on atomic capability to remote side

289

290 The atomic push over smart HTTP transport did not work, which has

@@ -558,26 +293,19 @@ of the repositories listed at

293 Will merge to 'master'.

294

295

561 -* dl/allow-running-cocci-verbosely (2019-10-12) 1 commit

562 - (merged to 'next' on 2019-10-15 at 474dc9f86e)

563 - + Makefile: respect $(V) in %.cocci.patch target

564 -

565 - Dev support update.

566 -

567 - Will merge to 'master'.

568 -

569 -

570 -* dl/format-patch-cover-from-desc (2019-10-15) 3 commits

571 - - format-patch: teach --cover-from-description option

572 - - format-patch: use enum variables

573 - - format-patch: change erroneous and condition

296 +* dl/format-patch-cover-from-desc (2019-10-16) 3 commits

297 + (merged to 'next' on 2019-10-18 at 40e992b6f5)

298 + + format-patch: teach --cover-from-description option

299 + + format-patch: use enum variables

300 + + format-patch: replace erroneous and condition

301

302 The branch description ("git branch --edit-description") has been

303 used to fill the body of the cover letters by the format-patch

304 command; this has been enhanced so that the subject can also be

305 filled.

306

580 - Expecting a reroll.

307 + Will cook in 'next'.

308 + No need for rush, as this is a new feature.

309

310

311 * en/merge-recursive-directory-rename-fixes (2019-10-12) 2 commits

@@ -585,123 +313,48 @@ of the repositories listed at

313 + merge-recursive: fix merging a subdirectory into the root directory

314 + merge-recursive: clean up get_renamed_dir_portion()

315

588 - A few glitches in the heuristic in merge-recursive to infer file

589 - movements based on movements of other files in the same directory

590 - have been corrected.

316 + When all files from some subdirectory were renamed to the root

317 + directory, the directory rename heuristics would fail to detect that

318 + as a rename/merge of the subdirectory to the root directory, which has

319 + been corrected.

320

321 Will merge to 'master'.

322

323

595 -* jt/fetch-pack-record-refs-in-the-dot-promisor (2019-10-15) 1 commit

596 - - fetch-pack: write fetched refs to .promisor

324 +* jt/fetch-pack-record-refs-in-the-dot-promisor (2019-10-16) 1 commit

325 + (merged to 'next' on 2019-10-18 at 4ead52e59a)

326 + + fetch-pack: write fetched refs to .promisor

327

328 Debugging support for lazy cloning has been a bit improved.

329

600 - Will merge to 'next'.

330 + Will cook in 'next'.

331 + No need for rush, as this is a new feature.

332

333

334 * mb/clarify-zsh-completion-doc (2019-10-12) 1 commit

604 - - doc: Change zsh git completion file name

335 + - completion: clarify installation instruction for zsh

336

337 The installation instruction for zsh completion script (in

338 contrib/) has been a bit improved.

339

609 - Expecting a reroll.

610 -

611 -

612 -* rs/column-use-utf8-strnwidth (2019-10-15) 1 commit

613 - (merged to 'next' on 2019-10-15 at 3be15b4478)

614 - + column: use utf8_strnwidth() to strip out ANSI color escapes

615 -

616 - Code cleanup.

617 -

618 - Will merge to 'master'.

619 -

620 -

621 -* rs/http-push-simplify (2019-10-15) 1 commit

622 - (merged to 'next' on 2019-10-15 at 4abc29286c)

623 - + http-push: simplify deleting a list item

624 -

625 - Code cleanup.

626 -

627 - Will merge to 'master'.

628 -

629 -

630 -* rs/remote-curl-use-argv-array (2019-10-15) 1 commit

631 - (merged to 'next' on 2019-10-15 at 8d0375a874)

632 - + remote-curl: use argv_array in parse_push()

633 -

634 - Code cleanup.

635 -

636 - Will merge to 'master'.

340 + Will merge to 'next' and then to 'master'.

341

342

343 * nr/diff-highlight-indent-fix (2019-10-15) 1 commit

344 - diff-highlight: fix a whitespace nit

345

642 ---------------------------------------------------

643 -[Stalled]

644 -

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

646 - - grep: avoid leak of chartables in PCRE2

647 - - grep: make PCRE2 aware of custom allocator

648 - - grep: make PCRE1 aware of custom allocator

649 -

650 - WIP (this is v3 which is rather old, where the last message in the

651 - discussion talks about v6 that has never been sent to the list).

652 - cf. <CAPUEspjJNSrJQT7xV2fsdp2t5odW5fzzPdDxuar_5x_JPUtf6Q@mail.gmail.com>

653 -

654 -

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

656 - - index: offer advice for unknown index extensions

657 - - index: do not warn about unrecognized extensions

658 -

659 - A bit too alarming warning given when unknown index extensions

660 - exist is getting revamped.

661 -

662 - Expecting a reroll.

663 -

664 -

665 -* jc/format-patch-delay-message-id (2019-04-05) 1 commit

666 - - format-patch: move message-id and related headers to the end

667 -

668 - The location "git format-patch --thread" adds the Message-Id:

669 - header in the series of header fields has been moved down, which

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

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

672 -

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

674 - Needs tests.

675 -

676 -

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

678 - - protocol: advertise multiple supported versions

679 -

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

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

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

683 - side choosing from one of them.

684 -

685 - Expecting a reroll.

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

687 -

688 -

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

690 - - zlib.c: use size_t for size

346 + Code cleanup.

347

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

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

694 - updated to use "size_t".

348 + Will merge to 'next' and then to 'master'.

349

696 ---------------------------------------------------

697 -[Cooking]

350

351 * es/walken-tutorial (2019-10-12) 1 commit

700 - - documentation: add tutorial for object walking

352 + (merged to 'next' on 2019-10-18 at 59160e59e9)

353 + + documentation: add tutorial for object walking

354

355 A tutorial on object enumeration.

356

704 - Will merge to 'next'.

357 + Will cook in 'next'.

358

359

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

@@ -727,27 +380,19 @@ of the repositories listed at

380 cf. <20191008194012.4s35pbwbh25rblhb@camp.crustytoothpaste.net>

381

382

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

731 - (merged to 'next' on 2019-10-15 at 93c9949b6a)

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

733 -

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

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

736 -

737 - Will merge to 'master'.

738 -

739 -

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

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

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

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

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

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

384 + (merged to 'next' on 2019-10-18 at 8dac803e49)

385 + + sequencer: directly call pick_commits() from complete_action()

386 + + rebase: fill `squash_onto' in get_replay_opts()

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

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

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

390

391 Reduce unnecessary reading of state variables back from the disk

392 during sequener operation.

393

750 - Will merge to 'next'.

394 + Will cook in 'next'.

395 + No need for rush, as this does not fix anything nor adds any new feature.

396

397

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

@@ -803,31 +448,9 @@ of the repositories listed at

448

449 The beginning of rewriting "git add -i" in C.

450

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

807 -

808 -

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

810 - - reset: unstage empty deleted ita files

811 -

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

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

814 -

815 - Expecting a reroll.

816 -

817 -

818 -* ra/rebase-i-more-options (2019-09-09) 6 commits

819 - - rebase: add --reset-author-date

820 - - rebase -i: support --ignore-date

821 - - sequencer: rename amend_author to author_to_rename

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

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

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

825 -

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

827 - rebase" proper.

828 -

829 - Needs to consider existing GIT_COMMITTER_DATE environment, etc.

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

451 + Expecting a reroll on top of a base with the tg/stash-refresh-index

452 + topic that defines an updated repo_refresh_and_write_index() helper.

453 + cf. <20190911175201.GA11444@cat>

454

455 --------------------------------------------------

456 [Discarded]

What's cooking (2019/10 #05)