8051bb0ca1 · 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 2019, #01; Mon, 3)

3 +Subject: What's cooking in git.git (Jun 2019, #02; Thu, 6)

4 X-master-at: 74583d89127e21255c12dd3c8a3bf60b497d7d03

5 -X-next-at: 20b46463406ef6ca70b1a63c5e26d4e2ead8dc13

5 +X-next-at: ee3066bb6536c68f973b3c0ffaaa13f4bfda5ea3

6

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

7 +What's cooking in git.git (Jun 2019, #02; Thu, 6)

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

9

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

@@ -12,10 +12,9 @@ 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 -The third round of release candidate has been tagged, as we decided

16 -to merge one last minute topic with security implications.

17 -Hopefully the final will be identical to this one, modulo l10n that

18 -needs to happen on top.

15 +On top of -rc3, the tip of 'master' will have a fix for a

16 +corner-case regression in the merge-recursive machinery introduced

17 +during this cycle before the final.

18

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

20 of the repositories listed at

@@ -23,43 +22,93 @@ of the repositories listed at

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

23

24 --------------------------------------------------

26 -[Graduated to "master"]

25 +[New Topics]

26

28 -* cc/list-objects-filter-wo-sparse-path (2019-05-29) 1 commit

29 - (merged to 'next' on 2019-05-30 at 5a294203ad)

30 - + list-objects-filter: disable 'sparse:path' filters

27 +* en/merge-directory-renames-fix (2019-06-05) 1 commit

28 + (merged to 'next' on 2019-06-06 at fd59bad9d7)

29 + + merge-recursive: restore accidentally dropped setting of path

30

32 - Disable "--filter=sparse:path=<path>" that would allow reading from

33 - paths on the filesystem.

31 + Recent code restructuring of merge-recursive engine introduced a

32 + regression dealing with rename/add conflict.

33

35 ---------------------------------------------------

36 -[New Topics]

34 + Will merge to 'master'.

35

38 -* md/list-objects-filter-memfix (2019-05-31) 1 commit

39 - - list-objects-filter: correct usage of ALLOC_GROW

36

41 - The filter_data used in the list-objects-filter (which manages a

42 - lazily sparse clone repository) did not use the dynamic array API

43 - correctly---'nr' is supposed to point at one past the last element

44 - of the array in use. This has been corrected.

37 +* fc/fetch-with-import-fix (2019-06-04) 5 commits

38 + - fetch: fix regression with transport helpers

39 + - fetch: make the code more understandable

40 + - fetch: trivial cleanup

41 + - t5801 (remote-helpers): add test to fetch tags

42 + - t5801 (remote-helpers): cleanup refspec stuff

43 +

44 + Code restructuring during 2.20 period broke fetching tags via

45 + "import" based transports.

46

47 Will merge to 'next'.

48

49

49 -* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit

50 - - list-objects-filter-options: error is localizeable

50 +* jl/status-reduce-vertical-blank (2019-06-04) 1 commit

51 + - status: remove the empty line after hints

52 + (this branch uses nd/switch-and-restore.)

53

52 - Make an end-user facing message localizable.

54 + Extra blank lines in "git status" output have been reduced.

55

54 - Will merge to 'next'.

56 + Needs to wait on nd/switch-and-restore to stabilize.

57

58

57 -* cm/send-email-document-req-modules (2019-05-31) 1 commit

58 - - send-email: update documentation of required Perl modules

59 +* md/url-parse-harden (2019-06-04) 2 commits

60 + (merged to 'next' on 2019-06-06 at b187c3dbfe)

61 + + url: do not allow %00 to represent NUL in URLs

62 + + url: do not read past end of buffer

63

60 - A doc update.

64 + The URL decoding code has been updated to avoid going past the end

65 + of the string while parsing %-<hex>-<hex> sequence.

66

62 - Will merge to 'next'.

67 + Will cook in 'next'.

68 +

69 +

70 +* mo/clang-format-for-each-update (2019-06-04) 1 commit

71 + (merged to 'next' on 2019-06-06 at ee3066bb65)

72 + + clang-format: use git grep to generate the ForEachMacros list

73 +

74 + The list of for-each like macros used by clang-format has been

75 + updated.

76 +

77 + Will cook in 'next'.

78 +

79 +

80 +* dl/config-alias-doc (2019-06-06) 2 commits

81 + - config/alias.txt: document alias accepting non-command first word

82 + - config/alias.txt: change " and ' to `

83 +

84 +

85 +* dl/includeif-onbranch (2019-06-05) 1 commit

86 + - config: learn the "onbranch:" includeIf condition

87 +

88 +

89 +* ds/commit-graph-incremental (2019-06-06) 15 commits

90 + - SQUASH??? 5323 is already taken

91 + - commit-graph: clean up chains after flattened write

92 + - commit-graph: verify chains with --shallow mode

93 + - commit-graph: create options for split files

94 + - commit-graph: expire commit-graph files

95 + - commit-graph: allow cross-alternate chains

96 + - commit-graph: merge commit-graph chains

97 + - commit-graph: add --split option to builtin

98 + - commit-graph: write commit-graph chains

99 + - commit-graph: rearrange chunk count logic

100 + - commit-graph: add base graphs chunk

101 + - commit-graph: load commit-graph chains

102 + - commit-graph: rename commit_compare to oid_compare

103 + - commit-graph: prepare for commit-graph chains

104 + - commit-graph: document commit-graph chains

105 + (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)

106 +

107 + Needs to wait on ds/commit-graph-write-refactor to stabilize.

108 +

109 +

110 +* tm/tag-gpgsign-config (2019-06-05) 1 commit

111 + - tag: add tag.gpgSign config option to force all tags be GPG-signed

112

113 --------------------------------------------------

114 [Stalled]

@@ -145,6 +194,36 @@ of the repositories listed at

194 --------------------------------------------------

195 [Cooking]

196

197 +* md/list-objects-filter-memfix (2019-05-31) 1 commit

198 + (merged to 'next' on 2019-06-06 at 80f0187cef)

199 + + list-objects-filter: correct usage of ALLOC_GROW

200 +

201 + The filter_data used in the list-objects-filter (which manages a

202 + lazily sparse clone repository) did not use the dynamic array API

203 + correctly---'nr' is supposed to point at one past the last element

204 + of the array in use. This has been corrected.

205 +

206 + Will cook in 'next'.

207 +

208 +

209 +* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit

210 + (merged to 'next' on 2019-06-06 at 736f3c175b)

211 + + list-objects-filter-options: error is localizeable

212 +

213 + Make an end-user facing message localizable.

214 +

215 + Will cook in 'next'.

216 +

217 +

218 +* cm/send-email-document-req-modules (2019-05-31) 1 commit

219 + (merged to 'next' on 2019-06-06 at acf1c2fc96)

220 + + send-email: update documentation of required Perl modules

221 +

222 + A doc update.

223 +

224 + Will cook in 'next'.

225 +

226 +

227 * po/doc-branch (2019-05-29) 1 commit

228 - doc branch: provide examples for listing remote tracking branches

229

@@ -161,11 +240,12 @@ of the repositories listed at

240

241

242 * ab/hash-object-doc (2019-05-28) 1 commit

164 - - hash-object doc: stop mentioning git-cvsimport

243 + (merged to 'next' on 2019-06-06 at 8e4d85b906)

244 + + hash-object doc: stop mentioning git-cvsimport

245

246 Doc update.

247

168 - Will merge to 'next'.

248 + Will cook in 'next'.

249

250

251 * ds/object-info-for-prefetch-fix (2019-05-28) 1 commit

@@ -462,7 +542,7 @@ of the repositories listed at

542 - packfile: rename close_all_packs to close_object_store

543 - packfile: close commit-graph in close_all_packs

544 - commit-graph: use raw_object_store when closing

465 - (this branch uses ds/commit-graph-write-refactor.)

545 + (this branch uses ds/commit-graph-write-refactor; is tangled with ds/commit-graph-incremental.)

546

547 The commit-graph file is now part of the "files that the runtime

548 may keep open file descriptors on, all of which would need to be

@@ -577,13 +657,16 @@ of the repositories listed at

657 Will cook in 'next'.

658

659

580 -* an/ignore-doc-update (2019-05-31) 1 commit

581 - - gitignore.txt: make slash-rules more readable

660 +* an/ignore-doc-update (2019-06-04) 1 commit

661 + (merged to 'next' on 2019-06-06 at 8579d82c0d)

662 + + gitignore.txt: make slash-rules more readable

663

664 The description about slashes in gitignore patterns (used to

665 indicate things like "anchored to this level only" and "only

666 matches directories") has been revamped.

667

668 + Will cook in 'next'.

669 +

670

671 * en/fast-export-encoding (2019-05-14) 5 commits

672 (merged to 'next' on 2019-05-16 at c88bd3edb5)

@@ -633,6 +716,8 @@ of the repositories listed at

716 '+', similar to the way the currently checked out branch is shown

717 with '*' in front.

718

719 + Will merge to 'next'.

720 +

721

722 * es/first-contrib-tutorial (2019-05-29) 3 commits

723 (merged to 'next' on 2019-05-30 at 96317960ab)

@@ -717,6 +802,7 @@ of the repositories listed at

802 - doc: document --overwrite-ignore

803 - git-checkout.txt: fix one syntax line

804 - git-checkout.txt: spell out --no-option

805 + (this branch is used by jl/status-reduce-vertical-blank.)

806

807 Two new commands "git switch" and "git restore" are introduced to

808 split "checking out a branch to work on advancing its history" and

@@ -724,8 +810,6 @@ of the repositories listed at

810 advancing the current history" out of the single "git checkout"

811 command.

812

727 - The "switch" part seems more or less ready for testing. Perhaps

728 - we should split this back into two topics and merge it to 'next'.

813 cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)

814 cf. <20190425094600.15673-1-pclouds@gmail.com> (restore v3)

815

@@ -799,7 +883,7 @@ of the repositories listed at

883 - commit-graph: collapse parameters into flags

884 - commit-graph: return with errors during write

885 - commit-graph: fix the_repository reference

802 - (this branch is used by ds/close-object-store.)

886 + (this branch is used by ds/close-object-store and ds/commit-graph-incremental.)

887

888 Renamed from commit-graph-format-v2 and changed scope.

889

What's cooking (2019/06 #02)