9db014fc5d · 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 (Jun 2018, #04; Fri, 15)

4 -X-master-at: 68372c88794aba15f853542008cda39def768372

5 -X-next-at: 013aa6912eb2e1677775c77626d7d5dcd8eaad9f

3 +Subject: What's cooking in git.git (Jun 2018, #05; Mon, 18)

4 +X-master-at: 242ba98e44d8314fb184d240939614a3c9b424db

5 +X-next-at: bc9c50bdf60868ed40cbc0564f532ce4092e3b67

6

7 -What's cooking in git.git (Jun 2018, #04; Fri, 15)

7 +What's cooking in git.git (Jun 2018, #05; Mon, 18)

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

9

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

@@ -12,13 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -We passed -rc2 mark; there are still a few hotfixes that correct

16 -obvious bugs introduced during this cycle in trivial ways that need

17 -to be merged before the final, and I also need to pull the i18n/l10n

18 -updates, but other than that, I think we are in relatively good

19 -shape given the upcoming release is fairly a big one judging from

20 -historical norms. Knock, knock...

21 -

15 You can find the changes described here in the integration branches

16 of the repositories listed at

17

@@ -27,49 +20,30 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

30 -* jk/index-pack-maint (2018-06-11) 3 commits

31 - (merged to 'next' on 2018-06-11 at f85a566b11)

32 - + index-pack: correct install_packed_git() args

33 - (merged to 'next' on 2018-06-04 at c553a485e8)

34 - + index-pack: handle --strict checks of non-repo packs

35 - + prepare_commit_graft: treat non-repository as a noop

36 -

37 - "index-pack --strict" has been taught to make sure that it runs the

38 - final object integrity checks after making the freshly indexed

39 - packfile available to itself.

40 -

41 -

42 -* jk/submodule-fsck-loose-fixup (2018-06-11) 2 commits

43 - (merged to 'next' on 2018-06-11 at 3eadb39c0a)

44 - + fsck: avoid looking at NULL blob->object

45 - + t7415: don't bother creating commit for symlink test

46 -

47 - Finishing touches to a topic that already is in 'maint'.

48 -

49 -

50 -* sb/submodule-merge-in-merge-recursive (2018-06-11) 1 commit

51 - (merged to 'next' on 2018-06-11 at ad05b6bc6a)

52 - + merge-submodule: reduce output verbosity

53 -

54 - Finishing touches to a topic that already is in 'master'.

23 +* ab/cred-netrc-no-autodie (2018-06-13) 1 commit

24 + (merged to 'next' on 2018-06-14 at 68171b82a7)

25 + + git-credential-netrc: remove use of "autodie"

26

27 + Hotfix for contrib/ stuff broken by this cycle.

28

57 -* sg/completion-zsh-workaround (2018-06-12) 1 commit

58 - (merged to 'next' on 2018-06-12 at 331a1db143)

59 - + completion: correct zsh detection when run from git-completion.zsh

29

61 - Work around zsh segfaulting when loading git-completion.zsh

30 +* es/make-no-iconv (2018-06-15) 1 commit

31 + (merged to 'next' on 2018-06-18 at b53e9933c9)

32 + + Makefile: make NO_ICONV really mean "no iconv"

33

63 ---------------------------------------------------

64 -[New Topics]

34 + "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV

35 + (i.e. linkage of -lintl, -liconv, etc. that are platform-specific

36 + tweaks), which has been corrected.

37

66 -* ab/cred-netrc-no-autodie (2018-06-13) 1 commit

67 - (merged to 'next' on 2018-06-14 at 68171b82a7)

68 - + git-credential-netrc: remove use of "autodie"

38

70 - Hotfix for contrib/ stuff broken by this cycle.

39 +* jk/ewah-bounds-check (2018-06-18) 2 commits

40 + (merged to 'next' on 2018-06-18 at bf606be1bb)

41 + + ewah: adjust callers of ewah_read_mmap()

42 + + ewah_read_mmap: bounds-check mmap reads

43 + (this branch is used by ds/ewah-cleanup.)

44

72 - Will merge to 'master'.

45 + The code to read compressed bitmap was not careful to avoid reading

46 + past the end of the file, which has been corrected.

47

48

49 * jl/zlib-restore-nul-termination (2018-06-13) 1 commit

@@ -79,152 +53,112 @@ of the repositories listed at

53 Make zlib inflate codepath more robust against versions of zlib

54 that clobber unused portion of outbuf.

55

82 - Will merge to 'master'.

56

57 +* js/rebase-i-root-fix (2018-06-18) 2 commits

58 + (merged to 'next' on 2018-06-18 at a6a1cf01d5)

59 + + rebase --root: fix amending root commit messages

60 + + rebase --root: demonstrate a bug while amending root commit messages

61

85 -* rd/doc-remote-tracking-with-hyphen (2018-06-13) 1 commit

86 - (merged to 'next' on 2018-06-14 at 013aa6912e)

87 - + Use hyphenated "remote-tracking branch" (docs and comments)

88 -

89 - Doc update.

90 -

91 - Will merge to 'master'.

62 + A regression to "rebase -i --root" introduced during this cycle has

63 + been fixed.

64

65

94 -* en/rename-directory-detection (2018-06-14) 1 commit

95 - (merged to 'next' on 2018-06-14 at 0e4c6bd117)

96 - + merge-recursive: use xstrdup() instead of fixed buffer

97 -

98 - Newly added codepath in merge-recursive had potential buffer

99 - overrun, which has been fixed.

100 -

101 - Will merge to 'master'.

102 -

103 -

104 -* mw/doc-merge-enumfix (2018-06-14) 1 commit

105 - (merged to 'next' on 2018-06-14 at 7074d6d48e)

106 - + doc: update the order of the syntax `git merge --continue`

107 -

108 - Fix old merge glitch in Documentation during v2.13-rc0 era.

109 -

110 - Will merge to 'master'.

111 -

112 -

113 -* sb/blame-color (2018-06-14) 1 commit

114 - (merged to 'next' on 2018-06-14 at f8cd824d4d)

115 - + blame: release string_list after use in parse_color_fields()

116 -

117 - Leakfix.

66 +* km/doc-workflows-typofix (2018-06-12) 1 commit

67 + (merged to 'next' on 2018-06-13 at 21e6a8e67b)

68 + + gitworkflows: fix grammar in 'Merge upwards' rule

69

119 - Will merge to 'master'.

70 + Typofix.

71

72

122 -* ks/branch-set-upstream (2018-06-14) 1 commit

123 - - t3200: clarify description of --set-upstream test

73 +* ks/branch-set-upstream (2018-06-18) 1 commit

74 + (merged to 'next' on 2018-06-18 at 83b0b87013)

75 + + t3200: clarify description of --set-upstream test

76

77 A test title has been reworded to clarify it.

78

79

128 -* jt/fetch-pack-negotiator (2018-06-15) 7 commits

129 - - fetch-pack: introduce negotiator API

130 - - fetch-pack: move common check and marking together

131 - - fetch-pack: make negotiation-related vars local

132 - - fetch-pack: use ref adv. to prune "have" sent

133 - - fetch-pack: directly end negotiation if ACK ready

134 - - fetch-pack: clear marks before re-marking

135 - - fetch-pack: split up everything_local()

136 -

137 - Code restructuring and a small fix to transport protocol v2 during

138 - fetching.

139 -

80 +* ld/git-p4-updates (2018-06-12) 6 commits

81 + (merged to 'next' on 2018-06-13 at 4f7e24b3c4)

82 + + git-p4: auto-size the block

83 + + git-p4: narrow the scope of exceptions caught when parsing an int

84 + + git-p4: raise exceptions from p4CmdList based on error from p4 server

85 + + git-p4: better error reporting when p4 fails

86 + + git-p4: add option to disable syncing of p4/master with p4

87 + + git-p4: disable-rebase: allow setting this via configuration

88 + (this branch uses rm/p4-submit-with-commit-option.)

89

141 -* ag/rebase-i-append-todo-help (2018-06-14) 2 commits

142 - - rebase--interactive: rewrite append_todo_help() in C

143 - - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help

144 - (this branch is used by ag/rebase-i-rewrite-todo; uses ag/rebase-p.)

90 + "git p4" updates.

91

146 - Stepwise rewriting of the machinery of "rebase -i" into C continues.

92

93 +* mw/doc-merge-enumfix (2018-06-14) 1 commit

94 + (merged to 'next' on 2018-06-14 at 7074d6d48e)

95 + + doc: update the order of the syntax `git merge --continue`

96

149 -* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits

150 - - rebase--interactive: rewrite the edit-todo functionality in C

151 - - editor: add a function to launch the sequence editor

152 - - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo

153 - (this branch uses ag/rebase-i-append-todo-help and ag/rebase-p.)

97 + Fix old merge glitch in Documentation during v2.13-rc0 era.

98

155 - Stepwise rewriting of the machinery of "rebase -i" into C continues.

99

100 +* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit

101 + (merged to 'next' on 2018-06-13 at 38ef825556)

102 + + sha1-file.c: correct $GITDIR to $GIT_DIR in a comment

103

158 -* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits

159 - - t5526: test recursive submodules when fetching moved submodules

160 - - submodule: fix NULL correctness in renamed broken submodules

104 + In code comment typofix

105

162 - The code to try seeing if a fetch is necessary in a submodule

163 - during a fetch with --recurse-submodules got confused when the path

164 - to the submodule was changed in the range of commits in the

165 - superproject, sometimes showing "(null)". This has been corrected.

106

167 - Will merge to 'next'.

107 +* rd/diff-options-typofix (2018-06-11) 1 commit

108 + (merged to 'next' on 2018-06-13 at a5aa58fa1b)

109 + + diff-options.txt: fix minor typos, font inconsistencies, in docs

110

111 + Typofix.

112

170 -* sb/submodule-core-worktree (2018-06-14) 3 commits

171 - - submodule deinit: unset core.worktree

172 - - submodule: ensure core.worktree is set after update

173 - - submodule: unset core.worktree if no working tree is present

113

175 - "git submodule" did not correctly adjust core.worktree setting that

176 - indicates whether/where a submodule repository has its associated

177 - working tree across various state transitions, which has been

178 - corrected.

114 +* rd/doc-remote-tracking-with-hyphen (2018-06-13) 1 commit

115 + (merged to 'next' on 2018-06-14 at 013aa6912e)

116 + + Use hyphenated "remote-tracking branch" (docs and comments)

117

180 - Will merge to 'next'.

118 + Doc update.

119

120

183 -* jk/ewah-bounds-check (2018-06-15) 2 commits

184 - - ewah: adjust callers of ewah_read_mmap()

185 - - ewah_read_mmap: bounds-check mmap reads

186 - (this branch is used by ds/ewah-cleanup.)

121 +* rm/p4-submit-with-commit-option (2018-06-12) 1 commit

122 + (merged to 'next' on 2018-06-13 at d3a272c733)

123 + + git-p4: add options --commit and --disable-rebase

124 + (this branch is used by ld/git-p4-updates.)

125

188 - The code to read compressed bitmap was not careful to avoid reading

189 - past the end of the file, which has been corrected.

126 + "git p4" updates.

127

191 - Will merge to 'next'.

128

129 +* sb/blame-color (2018-06-14) 1 commit

130 + (merged to 'next' on 2018-06-14 at f8cd824d4d)

131 + + blame: release string_list after use in parse_color_fields()

132

194 -* ds/ewah-cleanup (2018-06-15) 9 commits

195 - - ewah: drop ewah_serialize_native function

196 - - ewah: drop ewah_deserialize function

197 - - ewah_io: delete unused 'ewah_serialize()'

198 - - ewah_bitmap: delete unused 'ewah_or()'

199 - - ewah_bitmap: delete unused 'ewah_not()'

200 - - ewah_bitmap: delete unused 'ewah_and_not()'

201 - - ewah_bitmap: delete unused 'ewah_and()'

202 - - ewah/bitmap.c: delete unused 'bitmap_each_bit()'

203 - - ewah/bitmap.c: delete unused 'bitmap_clear()'

204 - (this branch uses jk/ewah-bounds-check.)

133 + Leakfix.

134

206 - Remove unused function definitions and declarations from ewah

207 - bitmap subsystem.

135

209 - Will merge to 'next'.

136 +* sg/t7406-chain-fix (2018-06-18) 1 commit

137 + (merged to 'next' on 2018-06-18 at 816d976ea6)

138 + + t7406-submodule-update: fix broken &&-chains

139

140 + Test fix.

141

212 -* jc/clean-after-sanity-tests (2018-06-15) 1 commit

213 - - tests: clean after SANITY tests

142 +--------------------------------------------------

143 +[New Topics]

144

215 - test cleanup.

145 +* en/rename-directory-detection-reboot (2018-06-18) 1 commit

146 + (merged to 'next' on 2018-06-18 at 95c454d3f4)

147 + + merge-recursive: use xstrdup() instead of fixed buffer

148

217 - Will merge to 'next'.

149 + Newly added codepath in merge-recursive had potential buffer

150 + overrun, which has been fixed.

151

152 + Will merge to 'master'.

153

220 -* es/make-no-iconv (2018-06-15) 1 commit

221 - - Makefile: make NO_ICONV really mean "no iconv"

154

223 - "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV

224 - (i.e. linkage of -lintl, -liconv, etc. that are platform-specific

225 - tweaks), which has been corrected.

155 +* tz/cred-netrc-cleanup (2018-06-18) 3 commits

156 + - git-credential-netrc: fix exit status when tests fail

157 + - git-credential-netrc: use in-tree Git.pm for tests

158 + - git-credential-netrc: minor whitespace cleanup in test script

159

227 - Will merge to 'next'.

160 + Build and test procedure for netrc credential helper (in contrib/)

161 + has been updated.

162

163 --------------------------------------------------

164 [Stalled]

@@ -353,6 +287,86 @@ of the repositories listed at

287 --------------------------------------------------

288 [Cooking]

289

290 +* jt/fetch-pack-negotiator (2018-06-15) 7 commits

291 + - fetch-pack: introduce negotiator API

292 + - fetch-pack: move common check and marking together

293 + - fetch-pack: make negotiation-related vars local

294 + - fetch-pack: use ref adv. to prune "have" sent

295 + - fetch-pack: directly end negotiation if ACK ready

296 + - fetch-pack: clear marks before re-marking

297 + - fetch-pack: split up everything_local()

298 +

299 + Code restructuring and a small fix to transport protocol v2 during

300 + fetching.

301 +

302 +

303 +* ag/rebase-i-append-todo-help (2018-06-14) 2 commits

304 + - rebase--interactive: rewrite append_todo_help() in C

305 + - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help

306 + (this branch is used by ag/rebase-i-rewrite-todo; uses ag/rebase-p.)

307 +

308 + Stepwise rewriting of the machinery of "rebase -i" into C continues.

309 +

310 +

311 +* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits

312 + - rebase--interactive: rewrite the edit-todo functionality in C

313 + - editor: add a function to launch the sequence editor

314 + - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo

315 + (this branch uses ag/rebase-i-append-todo-help and ag/rebase-p.)

316 +

317 + Stepwise rewriting of the machinery of "rebase -i" into C continues.

318 +

319 +

320 +* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits

321 + - t5526: test recursive submodules when fetching moved submodules

322 + - submodule: fix NULL correctness in renamed broken submodules

323 +

324 + The code to try seeing if a fetch is necessary in a submodule

325 + during a fetch with --recurse-submodules got confused when the path

326 + to the submodule was changed in the range of commits in the

327 + superproject, sometimes showing "(null)". This has been corrected.

328 +

329 + Will merge to 'next'.

330 +

331 +

332 +* sb/submodule-core-worktree (2018-06-14) 3 commits

333 + - submodule deinit: unset core.worktree

334 + - submodule: ensure core.worktree is set after update

335 + - submodule: unset core.worktree if no working tree is present

336 +

337 + "git submodule" did not correctly adjust core.worktree setting that

338 + indicates whether/where a submodule repository has its associated

339 + working tree across various state transitions, which has been

340 + corrected.

341 +

342 + Will merge to 'next'.

343 +

344 +

345 +* ds/ewah-cleanup (2018-06-18) 9 commits

346 + - ewah: drop ewah_serialize_native function

347 + - ewah: drop ewah_deserialize function

348 + - ewah_io: delete unused 'ewah_serialize()'

349 + - ewah_bitmap: delete unused 'ewah_or()'

350 + - ewah_bitmap: delete unused 'ewah_not()'

351 + - ewah_bitmap: delete unused 'ewah_and_not()'

352 + - ewah_bitmap: delete unused 'ewah_and()'

353 + - ewah/bitmap.c: delete unused 'bitmap_each_bit()'

354 + - ewah/bitmap.c: delete unused 'bitmap_clear()'

355 +

356 + Remove unused function definitions and declarations from ewah

357 + bitmap subsystem.

358 +

359 + Will merge to 'next'.

360 +

361 +

362 +* jc/clean-after-sanity-tests (2018-06-15) 1 commit

363 + - tests: clean after SANITY tests

364 +

365 + test cleanup.

366 +

367 + Will merge to 'next'.

368 +

369 +

370 * is/parsing-line-range (2018-06-15) 2 commits

371 - log: prevent error if line range ends past end of file

372 - blame: prevent error if range ends past end of file

@@ -402,30 +416,6 @@ of the repositories listed at

416 Will cook in 'next'.

417

418

405 -* rd/diff-options-typofix (2018-06-11) 1 commit

406 - (merged to 'next' on 2018-06-13 at a5aa58fa1b)

407 - + diff-options.txt: fix minor typos, font inconsistencies, in docs

408 -

409 - Typofix.

410 -

411 - Will merge to 'master'.

412 -

413 -

414 -* ld/git-p4-updates (2018-06-12) 6 commits

415 - (merged to 'next' on 2018-06-13 at 4f7e24b3c4)

416 - + git-p4: auto-size the block

417 - + git-p4: narrow the scope of exceptions caught when parsing an int

418 - + git-p4: raise exceptions from p4CmdList based on error from p4 server

419 - + git-p4: better error reporting when p4 fails

420 - + git-p4: add option to disable syncing of p4/master with p4

421 - + git-p4: disable-rebase: allow setting this via configuration

422 - (this branch uses rm/p4-submit-with-commit-option.)

423 -

424 - "git p4" updates.

425 -

426 - Will merge to 'master'.

427 -

428 -

419 * en/merge-recursive-cleanup (2018-06-12) 6 commits

420 - merge-recursive: add pointer about unduly complex looking code

421 - merge-recursive: rename conflict_rename_*() family of functions

@@ -450,15 +440,6 @@ of the repositories listed at

440 Will cook in 'next'.

441

442

453 -* km/doc-workflows-typofix (2018-06-12) 1 commit

454 - (merged to 'next' on 2018-06-13 at 21e6a8e67b)

455 - + gitworkflows: fix grammar in 'Merge upwards' rule

456 -

457 - Typofix.

458 -

459 - Will merge to 'master'.

460 -

461 -

443 * ms/send-pack-honor-config (2018-06-12) 1 commit

444 (merged to 'next' on 2018-06-13 at e2cd933715)

445 + builtin/send-pack: populate the default configs

@@ -506,15 +487,6 @@ of the repositories listed at

487 Will merge to 'next'.

488

489

509 -* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit

510 - (merged to 'next' on 2018-06-13 at 38ef825556)

511 - + sha1-file.c: correct $GITDIR to $GIT_DIR in a comment

512 -

513 - In code comment typofix

514 -

515 - Will merge to 'master'.

516 -

517 -

490 * sg/update-ref-stdin-cleanup (2018-06-04) 1 commit

491 (merged to 'next' on 2018-06-13 at 2b9924760d)

492 + update-ref --stdin: use skip_prefix()

@@ -688,16 +660,6 @@ of the repositories listed at

660 Will cook in 'next'.

661

662

691 -* rm/p4-submit-with-commit-option (2018-06-12) 1 commit

692 - (merged to 'next' on 2018-06-13 at d3a272c733)

693 - + git-p4: add options --commit and --disable-rebase

694 - (this branch is used by ld/git-p4-updates.)

695 -

696 - "git p4" updates.

697 -

698 - Will merge to 'master'.

699 -

700 -

663 * ds/commit-graph-lockfile-fix (2018-05-22) 1 commit

664 (merged to 'next' on 2018-05-24 at 3d12a02b0c)

665 + commit-graph: fix UX issue when .lock file exists

What's cooking (2018/06 #05)